Title: [111301] releases/WebKitGTK/webkit-1.8
- Revision
- 111301
- Author
- mrobin...@webkit.org
- Date
- 2012-03-19 19:00:23 -0700 (Mon, 19 Mar 2012)
Log Message
Merging r111110
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (111300 => 111301)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-03-20 01:52:22 UTC (rev 111300)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-03-20 02:00:23 UTC (rev 111301)
@@ -1,3 +1,12 @@
+2012-03-19 Martin Robinson <mrobin...@igalia.com>
+
+ [Cairo] Text extent of shadowed text is calculated incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=65035
+
+ Reviewed by Martin Robinson
+
+ * platform/gtk/Skipped: Unskip a test that is now passing.
+
2012-03-06 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r109760.
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/gtk/Skipped (111300 => 111301)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/platform/gtk/Skipped 2012-03-20 01:52:22 UTC (rev 111300)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/platform/gtk/Skipped 2012-03-20 02:00:23 UTC (rev 111301)
@@ -1304,10 +1304,6 @@
http/tests/inspector-enabled
inspector/
-# Text shadow extents are calculated incorrectly
-# https://bugs.webkit.org/show_bug.cgi?id=65035
-fast/canvas/fillText-shadow.html
-
# Font feature settings is not implemented.
css3/font-feature-settings-rendering.html
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (111300 => 111301)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-20 01:52:22 UTC (rev 111300)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-20 02:00:23 UTC (rev 111301)
@@ -1,5 +1,21 @@
2012-03-19 Martin Robinson <mrobin...@igalia.com>
+ [Cairo] Text extent of shadowed text is calculated incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=65035
+
+ Reviewed by Martin Robinson.
+
+ No new tests. This is already covered by fast/canvas/fillText-shadow.html.
+
+ Correct determine the size of rendered text using x and y bearing from the font
+ extents.
+
+ * platform/graphics/cairo/FontCairo.cpp:
+ (WebCore::drawGlyphsShadow): Use the x and y bearing to calculate text extents.
+ This gives a more accurate sizing and avoids clipping the edges of the shadow.
+
+2012-03-19 Martin Robinson <mrobin...@igalia.com>
+
[GTK] Menulist buttons have separators even when the theme turns them off
https://bugs.webkit.org/show_bug.cgi?id=80668
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/cairo/FontCairo.cpp (111300 => 111301)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2012-03-20 01:52:22 UTC (rev 111300)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2012-03-20 02:00:23 UTC (rev 111301)
@@ -85,7 +85,8 @@
cairo_text_extents_t extents;
cairo_scaled_font_glyph_extents(font->platformData().scaledFont(), glyphs, numGlyphs, &extents);
- FloatRect fontExtentsRect(point.x(), point.y() - extents.height, extents.width, extents.height);
+ FloatRect fontExtentsRect(point.x() + extents.x_bearing, point.y() + extents.y_bearing, extents.width, extents.height);
+
if (GraphicsContext* shadowContext = shadow.beginShadowLayer(graphicsContext, fontExtentsRect)) {
drawGlyphsToContext(shadowContext->platformContext()->cr(), font, glyphs, numGlyphs);
shadow.endShadowLayer(graphicsContext);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
