Changeset 158219 in webkit

Timestamp:

Oct 29, 2013, 1:44:45 PM (13 years ago)

Author:

zoltan@webkit.org

Message:

Source/WebCore: [CSS Regions][CSS Shapes] Layout error when the shape has negative top coordinate and it's applied on the second region
<​https://webkit.org/b/123346>

Reviewed by David Hyatt.

We have a layout error when there is a shape applied on the second region, and it has a negative 'top' coordinate.
Since shapeInsideInfo::shapeLogicalTop() can return negative numbers, we need to check for it, when we're positioning
the first line in the region.

Test: fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread):

LayoutTests: [CSS Regions][CSS Shapes] Layout error when the shape has negative top coordinate and it's applied on the second region
<​http://webkit.org/b/123346>

Reviewed by David Hyatt.

We have a layout error when there is a shape applied on the second region, and it has a negative 'top' coordinate.
Since shapeInsideInfo::shapeLogicalTop() can return negative numbers, we need to check for it, when we're positioning
the first line in the region.

• fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html: Added.
• fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html (added)
• LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-29  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Regions][CSS Shapes] Layout error when the shape has negative top coordinate and it's applied on the second region
+        <http://webkit.org/b/123346>
+
+        Reviewed by David Hyatt.
+
+        We have a layout error when there is a shape applied on the second region, and it has a negative 'top' coordinate.
+        Since shapeInsideInfo::shapeLogicalTop() can return negative numbers, we need to check for it, when we're positioning
+        the first line in the region.
+
+        * fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html: Added.
+        * fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html: Added.
+
 2013-10-29  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-29  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Regions][CSS Shapes] Layout error when the shape has negative top coordinate and it's applied on the second region
+        <https://webkit.org/b/123346>
+
+        Reviewed by David Hyatt.
+
+        We have a layout error when there is a shape applied on the second region, and it has a negative 'top' coordinate.
+        Since shapeInsideInfo::shapeLogicalTop() can return negative numbers, we need to check for it, when we're positioning
+        the first line in the region.
+
+        Test: fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread):
+
 2013-10-29  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1444 +1444 @@
     if (isFirstLineInRegion || isFirstLineAdjusted) {
         LayoutUnit shapeTopOffset = layoutState.adjustedLogicalLineTop();
-        if (!shapeTopOffset)
+
+        if (!shapeTopOffset && (shapeInsideInfo->shapeLogicalTop() > 0))
             shapeTopOffset = shapeInsideInfo->shapeLogicalTop();