Changeset 168778 in webkit

Timestamp:

May 13, 2014 9:13:47 PM (10 years ago)

Author:

hmuller@adobe.com

Message:

[CSS Shapes] line height grows around polygon and incorrectly causes text to wrap to next line
​https://bugs.webkit.org/show_bug.cgi?id=131622

Reviewed by Bem Jones-Bey.

Source/WebCore:
Corrected an earlier PolygonShape fix ​https://bugs.webkit.org/show_bug.cgi?id=132132
When the top or bottom of a layout line is coincident with a polygon edge vertex, we
only consider it an intersection if the edge extends into the line.

Test: fast/shapes/shape-outside-floats/shape-outside-edge-case.html

• rendering/shapes/PolygonShape.cpp:

(WebCore::OffsetPolygonEdge::clippedEdgeXRange):

LayoutTests:

• fast/shapes/shape-outside-floats/shape-outside-edge-case-expected.html: Added.
• fast/shapes/shape-outside-floats/shape-outside-edge-case.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-edge-case-expected.html (added)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-edge-case.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/shapes/PolygonShape.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-13  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] line height grows around polygon and incorrectly causes text to wrap to next line
+        https://bugs.webkit.org/show_bug.cgi?id=131622
+
+        Reviewed by Bem Jones-Bey.
+
+        * fast/shapes/shape-outside-floats/shape-outside-edge-case-expected.html: Added.
+        * fast/shapes/shape-outside-floats/shape-outside-edge-case.html: Added.
+
 2014-05-13  Myles C. Maxfield  <litherum@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-13  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] line height grows around polygon and incorrectly causes text to wrap to next line
+        https://bugs.webkit.org/show_bug.cgi?id=131622
+
+        Reviewed by Bem Jones-Bey.
+
+        Corrected an earlier PolygonShape fix https://bugs.webkit.org/show_bug.cgi?id=132132
+        When the top or bottom of a layout line is coincident with a polygon edge vertex, we
+        only consider it an intersection if the edge extends into the line.
+
+        Test: fast/shapes/shape-outside-floats/shape-outside-edge-case.html
+
+        * rendering/shapes/PolygonShape.cpp:
+        (WebCore::OffsetPolygonEdge::clippedEdgeXRange):
+
 2014-05-13  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp

@@ -67 +67 @@
 FloatShapeInterval OffsetPolygonEdge::clippedEdgeXRange(float y1, float y2) const
 {
-    if (!overlapsYRange(y1, y2) || (y1 == maxY() && vertex2().y() < vertex1().y()))
+    if (!overlapsYRange(y1, y2) || (y1 == maxY() && minY() <= y1) || (y2 == minY() && maxY() >= y2))
         return FloatShapeInterval();