Changeset 166322 in webkit

Timestamp:

Mar 26, 2014 3:05:24 PM (10 years ago)

Author:

mmaxfield@apple.com

Message:

Skipping underlines disregard points completely inside the underline rect
​https://bugs.webkit.org/show_bug.cgi?id=130800

Patch by Myles C. Maxfield <​mmaxfield@apple.com> on 2014-03-26
Reviewed by Dean Jackson.

Source/WebCore:

When determining bounds for underline skipping, endpoints of glyph contours
that lie entirely within the rect of the underline are ignored. This patch
makes these points affect the skipping regions the same way that intersections
do.

Test: fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html

• platform/graphics/mac/FontMac.mm:

(WebCore::updateX): Refactored common code into a function
(WebCore::findPathIntersections): Test for endpoints which lie entirely within
the underline bounds

LayoutTests:

This test draws a glyph entire inside the underline. It should render the same
as it would without any underline at all.

• fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg: Added

an underscore glyph that would lie entirely within an underline

• fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline-expected.html (added)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html (added)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/FontMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-26  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Skipping underlines disregard points completely inside the underline rect
+        https://bugs.webkit.org/show_bug.cgi?id=130800
+
+        Reviewed by Dean Jackson.
+
+        This test draws a glyph entire inside the underline. It should render the same
+        as it would without any underline at all.
+
+        * fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg: Added
+        an underscore glyph that would lie entirely within an underline
+        * fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html:
+
 2014-03-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg

@@ -5 +5 @@
 <defs>
 <font id="Litherum" horiz-adv-x="1024">
-<font-face units-per-em="14" ascent="14" descent="-7"/>
-<glyph unicode="|" horiz-adv-x="14" d="M5 -7v21h4v-21z"/>
+<font-face units-per-em="56" ascent="56" descent="-28"/>
+<glyph unicode="|" horiz-adv-x="56" d="M20 -28v84h16v-84z"/>
+<glyph unicode="_" horiz-adv-x="56" d="M1 -5v1h54v-1z"/>
 </font>
 </defs>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-26  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Skipping underlines disregard points completely inside the underline rect
+        https://bugs.webkit.org/show_bug.cgi?id=130800
+
+        Reviewed by Dean Jackson.
+
+        When determining bounds for underline skipping, endpoints of glyph contours
+        that lie entirely within the rect of the underline are ignored. This patch
+        makes these points affect the skipping regions the same way that intersections
+        do.
+
+        Test: fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::updateX): Refactored common code into a function
+        (WebCore::findPathIntersections): Test for endpoints which lie entirely within
+        the underline bounds
+
 2014-03-26  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/FontMac.mm

@@ -389 +389 @@
 }
 
+static void updateX(GlyphIterationState& state, CGFloat x)
+{
+    state.minX = std::min(state.minX, x);
+    state.maxX = std::max(state.maxX, x);
+}
+
 // This function is called by CGPathApply and is therefore invoked for each
 // contour in a glyph. This function models each contours as a straight line
@@ -426 +432 @@
         return;
     CGFloat x;
-    if (findIntersectionPoint(state.y1, state.currentPoint, point, x)) {
-        state.minX = std::min(state.minX, x);
-        state.maxX = std::max(state.maxX, x);
-    }
-    if (findIntersectionPoint(state.y2, state.currentPoint, point, x)) {
-        state.minX = std::min(state.minX, x);
-        state.maxX = std::max(state.maxX, x);
-    }
+    if (findIntersectionPoint(state.y1, state.currentPoint, point, x))
+        updateX(state, x);
+    if (findIntersectionPoint(state.y2, state.currentPoint, point, x))
+        updateX(state, x);
+    if ((state.currentPoint.y >= state.y1 && state.currentPoint.y <= state.y2)
+        || (state.currentPoint.y <= state.y1 && state.currentPoint.y >= state.y2))
+        updateX(state, state.currentPoint.x);
     state.currentPoint = point;
 }