Changeset 166902 in webkit

Timestamp:

Apr 7, 2014 6:35:19 PM (10 years ago)

Author:

Martin Robinson

Message:

fast/css3-text/css3-text-decoration/text-decoration-thickness.html fails on GTK
​https://bugs.webkit.org/show_bug.cgi?id=129957

Reviewed by Dean Jackson.

Source/WebCore:

Causes existing tests to pass.

• platform/graphics/cairo/GraphicsContextCG.cpp: Use the now-shared computeLineBoundsAndAntialiasingModeForText.
• platform/graphics/cairo/GraphicsContextCairo.cpp: Align the Cairo version of text underline drawing with the CG version.
• platform/graphics/GraphicsContext.h: Add computeLineBoundsAndAntialiasingModeForText.
• platform/graphics/GraphicsContext.cpp: Ditto.

LayoutTests:

Unskipped tests and modified one test to use the platform-independent Ahem font.

• fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-tall-underlines.html: We

need to use Ahem because Helvetica is not a platform-independent font.

• platform/gtk/TestExpectations: Unskipped tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-tall-underlines.html (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsContext.h (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-07  Martin Robinson  <mrobinson@igalia.com>
+
+        fast/css3-text/css3-text-decoration/text-decoration-thickness.html fails on GTK
+        https://bugs.webkit.org/show_bug.cgi?id=129957
+
+        Reviewed by Dean Jackson.
+
+        Unskipped tests and modified one test to use the platform-independent Ahem font.
+
+        * fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-tall-underlines.html: We
+        need to use Ahem because Helvetica is not a platform-independent font.
+        * platform/gtk/TestExpectations: Unskipped tests.
+
 2014-04-07  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-tall-underlines.html

@@ -8 +8 @@
 an empty one.
 <div style="position: relative; overflow: hidden; width: 36px; height: 100px;">
-<div style="left: -160px; top: -320px; position: absolute; -webkit-transform: scale(20); font-family: helvetica; -webkit-transform-origin: left top; display: inline-block; text-decoration: underline; -webkit-text-decoration-skip: ink;">gy</div>
+<div style="left: -160px; top: -325px; position: absolute; -webkit-transform: scale(20); font-family: ahem; -webkit-transform-origin: left top; display: inline-block; text-decoration: underline; -webkit-text-decoration-skip: ink;">gy</div>
 </div>
 </body>

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1383 +1383 @@
 webkit.org/b/129180 svg/clip-path/clip-path-on-svg-002.svg [ ImageOnlyFailure ]
 
-webkit.org/b/129957 fast/css3-text/css3-text-decoration/text-decoration-thickness.html [ ImageOnlyFailure ]
-webkit.org/b/129957 fast/css3-text/css3-text-decoration/text-decoration-style-double-space-scales.html [ ImageOnlyFailure ]
-webkit.org/b/129957 fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-tall-underlines.html [ ImageOnlyFailure ]
-
 webkit.org/b/129958 svg/clip-path/mask-nested-clip-path-006.svg [ ImageOnlyFailure ]
 webkit.org/b/129958 svg/clip-path/mask-nested-clip-path-007.svg [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-07  Martin Robinson  <mrobinson@igalia.com>
+
+        fast/css3-text/css3-text-decoration/text-decoration-thickness.html fails on GTK
+        https://bugs.webkit.org/show_bug.cgi?id=129957
+
+        Reviewed by Dean Jackson.
+
+        Causes existing tests to pass.
+
+        * platform/graphics/cairo/GraphicsContextCG.cpp: Use the now-shared computeLineBoundsAndAntialiasingModeForText.
+        * platform/graphics/cairo/GraphicsContextCairo.cpp: Align the Cairo version of text underline drawing with the CG version.
+        * platform/graphics/GraphicsContext.h: Add computeLineBoundsAndAntialiasingModeForText.
+        * platform/graphics/GraphicsContext.cpp: Ditto.
+
 2014-04-07  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -960 +960 @@
 #endif
 
-}
+FloatRect GraphicsContext::computeLineBoundsAndAntialiasingModeForText(const FloatPoint& point, float width, bool printing, bool& shouldAntialias, Color& color)
+{
+    FloatPoint origin;
+    float thickness = std::max(strokeThickness(), 0.5f);
+
+    shouldAntialias = true;
+    if (printing)
+        origin = point;
+    else {
+        AffineTransform transform = getCTM(GraphicsContext::DefinitelyIncludeDeviceScale);
+        if (transform.preservesAxisAlignment())
+            shouldAntialias = false;
+
+        // This code always draws a line that is at least one-pixel line high,
+        // which tends to visually overwhelm text at small scales. To counter this
+        // effect, an alpha is applied to the underline color when text is at small scales.
+
+        // Just compute scale in x dimension, assuming x and y scales are equal.
+        float scale = transform.b() ? sqrtf(transform.a() * transform.a() + transform.b() * transform.b()) : transform.a();
+        if (scale < 1.0) {
+            static const float minimumUnderlineAlpha = 0.4f;
+            float shade = scale > minimumUnderlineAlpha ? scale : minimumUnderlineAlpha;
+            int alpha = color.alpha() * shade;
+            color = Color(color.red(), color.green(), color.blue(), alpha);
+        }
+
+        // Don't offset line from bottom of text if scale is less than offsetUnderLineScale.
+        static const float offsetUnderlineScale = 0.4f;
+        float dy = scale < offsetUnderlineScale ? 0 : 1;
+
+        // If we've increased the thickness of the line, make sure to move the location too.
+        if (thickness > 1)
+            dy += roundf(thickness) - 1;
+
+        FloatPoint devicePoint = transform.mapPoint(point);
+        FloatPoint deviceOrigin = FloatPoint(roundf(devicePoint.x()), ceilf(devicePoint.y()) + dy);
+        origin = transform.inverse().mapPoint(deviceOrigin);
+    }
+    return FloatRect(origin.x(), origin.y(), width, thickness);
+}
+
+}

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -568 +568 @@
         void platformFillRoundedRect(const FloatRoundedRect&, const Color&, ColorSpace);
 
+        FloatRect computeLineBoundsAndAntialiasingModeForText(const FloatPoint&, float width, bool printing, bool& shouldAntialias, Color&);
+
         GraphicsContextPlatformPrivate* m_data;
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -617 +617 @@
 }
 
-FloatRect GraphicsContext::computeLineBoundsForText(const FloatPoint& origin, float width, bool)
-{
-    return FloatRect(origin, FloatSize(width, strokeThickness()));
+FloatRect GraphicsContext::computeLineBoundsForText(const FloatPoint& origin, float width, bool printing)
+{
+    bool dummyBool;
+    Color dummyColor;
+    return computeLineBoundsAndAntialiasingModeForText(origin, width, printing, dummyBool, dummyColor);
 }
 
 void GraphicsContext::drawLineForText(const FloatPoint& origin, float width, bool printing, bool doubleUnderlines)
 {
-    if (paintingDisabled())
-        return;
-
-    cairo_t* cairoContext = platformContext()->cr();
-    cairo_save(cairoContext);
-
-    // This bumping of <1 stroke thicknesses matches the one in drawLineOnCairoContext.
-    FloatPoint endPoint(origin + IntSize(width, 0));
-    FloatRect lineExtents = computeLineBoundsForText(origin, width, printing);
-
-    ShadowBlur& shadow = platformContext()->shadowBlur();
-    if (GraphicsContext* shadowContext = shadow.beginShadowLayer(this, lineExtents)) {
-        drawLineOnCairoContext(this, shadowContext->platformContext()->cr(), origin, endPoint);
-        if (doubleUnderlines)
-            drawLineOnCairoContext(this, shadowContext->platformContext()->cr(), origin + FloatSize(0, strokeThickness() * 2), endPoint + FloatSize(0, strokeThickness() * 2));
-        shadow.endShadowLayer(this);
-    }
-
-    drawLineOnCairoContext(this, cairoContext, origin, endPoint);
-    if (doubleUnderlines)
-        drawLineOnCairoContext(this, cairoContext, origin + FloatSize(0, strokeThickness() * 2), endPoint + FloatSize(0, strokeThickness() * 2));
-    cairo_restore(cairoContext);
+    DashArray widths;
+    widths.append(width);
+    widths.append(0);
+    drawLinesForText(origin, widths, printing, doubleUnderlines);
 }
 
 void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing, bool doubleUnderlines)
 {
+    if (paintingDisabled())
+        return;
+
+    if (widths.size() <= 0)
+        return;
+
+    Color localStrokeColor(strokeColor());
+
+    bool shouldAntialiasLine;
+    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(point, widths.last(), printing, shouldAntialiasLine, localStrokeColor);
+
+    Vector<FloatRect, 4> dashBounds;
+    ASSERT(!(widths.size() % 2));
+    dashBounds.reserveInitialCapacity(dashBounds.size() / 2);
     for (size_t i = 0; i < widths.size(); i += 2)
-        drawLineForText(FloatPoint(point.x() + widths[i], point.y()), widths[i+1] - widths[i], printing, doubleUnderlines);
+        dashBounds.append(FloatRect(FloatPoint(bounds.x() + widths[i], bounds.y()), FloatSize(widths[i+1] - widths[i], bounds.height())));
+
+    if (doubleUnderlines) {
+        // The space between double underlines is equal to the height of the underline
+        for (size_t i = 0; i < widths.size(); i += 2)
+            dashBounds.append(FloatRect(FloatPoint(bounds.x() + widths[i], bounds.y() + 2 * bounds.height()), FloatSize(widths[i+1] - widths[i], bounds.height())));
+    }
+
+    cairo_t* cr = platformContext()->cr();
+    cairo_save(cr);
+
+    for (auto& dash : dashBounds)
+        fillRectWithColor(cr, dash, localStrokeColor);
+
+    cairo_restore(cr);
 }
 

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -1353 +1353 @@
 }
 
-static FloatRect computeLineBoundsAndAntialiasingModeForText(GraphicsContext& initialContext, const FloatPoint& point, float width, bool printing, bool& shouldAntialias, Color& color)
-{
-    CGContextRef context = initialContext.platformContext();
-    CGPoint origin;
-    CGFloat thickness = std::max(initialContext.strokeThickness(), 0.5f);
-
-    shouldAntialias = true;
-    if (printing)
-        origin = CGPointMake(point.x(), point.y());
-    else {
-        CGAffineTransform t = CGContextGetUserSpaceToDeviceSpaceTransform(context);
-        if (AffineTransform(t).preservesAxisAlignment())
-            shouldAntialias = false;
-
-        // This code always draws a line that is at least one-pixel line high,
-        // which tends to visually overwhelm text at small scales. To counter this
-        // effect, an alpha is applied to the underline color when text is at small scales.
-
-        // Just compute scale in x dimension, assuming x and y scales are equal.
-        CGFloat scale = t.b ? sqrtf(t.a * t.a + t.b * t.b) : t.a;
-        if (scale < 1.0) {
-            static const float MinUnderlineAlpha = 0.4f;
-            float shade = scale > MinUnderlineAlpha ? scale : MinUnderlineAlpha;
-            int alpha = color.alpha() * shade;
-            color = Color(color.red(), color.green(), color.blue(), alpha);
-        }
-
-        // Don't offset line from bottom of text if scale is less than OffsetUnderlineScale.
-        static const CGFloat OffsetUnderlineScale = 0.4f;
-        CGFloat dy = scale < OffsetUnderlineScale ? 0 : 1;
-
-        // If we've increased the thickness of the line, make sure to move the location too.
-        if (thickness > 1)
-            dy += roundf(thickness) - 1;
-
-        CGPoint devicePoint = CGPointApplyAffineTransform(point, t);
-        CGPoint deviceOrigin = CGPointMake(roundf(devicePoint.x), ceilf(devicePoint.y) + dy);
-        origin = CGPointApplyAffineTransform(deviceOrigin, CGAffineTransformInvert(t));
-    }
-    return FloatRect(origin.x, origin.y, width, thickness);
-}
-
 FloatRect GraphicsContext::computeLineBoundsForText(const FloatPoint& point, float width, bool printing)
 {
     bool dummyBool;
     Color dummyColor;
-    return computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, dummyBool, dummyColor);
+    return computeLineBoundsAndAntialiasingModeForText(point, width, printing, dummyBool, dummyColor);
 }
 
@@ -1421 +1379 @@
 
     bool shouldAntialiasLine;
-    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(*this, point, widths.last(), printing, shouldAntialiasLine, localStrokeColor);
+    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(point, widths.last(), printing, shouldAntialiasLine, localStrokeColor);
     bool fillColorIsNotEqualToStrokeColor = fillColor() != localStrokeColor;