Changeset 161384 in webkit

Timestamp:

Jan 6, 2014 4:42:41 PM (10 years ago)

Author:

zoltan@webkit.org

Message:

[CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()
​https://bugs.webkit.org/show_bug.cgi?id=125770

Reviewed by Bem Jones-Bey.

Source/WebCore:

When we have an e.g. up-side-down triangle, when the content doesn't fit in the bottom part of the shape,
and the adjusted content flows into the next region with a shape, we need to update the actual shape
and region. Since it wasn't updated, it led to a shape mismatch, which led to assert/layout error.

Test: fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html

• rendering/RenderBlockLineLayout.cpp:

(WebiCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread): Update current shape
and region, when adjustment occured.

LayoutTests:

• fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html: Added.
• fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html (added)
• LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-06  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()
+        https://bugs.webkit.org/show_bug.cgi?id=125770
+
+        Reviewed by Bem Jones-Bey.
+
+        * fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html: Added.
+        * fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html: Added.
+
 2014-01-06  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-06  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()
+        https://bugs.webkit.org/show_bug.cgi?id=125770
+
+        Reviewed by Bem Jones-Bey.
+
+        When we have an e.g. up-side-down triangle, when the content doesn't fit in the bottom part of the shape,
+        and the adjusted content flows into the next region with a shape, we need to update the actual shape
+        and region. Since it wasn't updated, it led to a shape mismatch, which led to assert/layout error.
+
+        Test: fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebiCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread): Update current shape
+        and region, when adjustment occured.
+
 2014-01-06  Seokju Kwon  <seokju@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1169 +1169 @@
 
     bool lineOverLapsWithShapeBottom = shapeBottomInFlowThread < logicalLineBottomInFlowThread;
-    bool lineOverLapsWithRegionBottom = logicalLineBottomInFlowThread > logicalRegionBottomInFlowThread;
+    bool lineTopAdjustedIntoNextRegion = layoutState.adjustedLogicalLineTop() >= currentRegion->logicalHeight();
+    bool lineOverLapsWithRegionBottom = logicalLineBottomInFlowThread > logicalRegionBottomInFlowThread || lineTopAdjustedIntoNextRegion;
     bool overFlowsToNextRegion = nextRegion && (lineOverLapsWithShapeBottom || lineOverLapsWithRegionBottom);
 
@@ -1185 +1186 @@
         logicalRegionTopInFlowThread = currentRegion->logicalTopForFlowThreadContent();
         logicalRegionBottomInFlowThread = logicalRegionTopInFlowThread + currentRegion->logicalHeight() - currentRegion->borderAndPaddingBefore() - currentRegion->borderAndPaddingAfter();
+
+        if (lineTopAdjustedIntoNextRegion)
+            layoutState.setAdjustedLogicalLineTop(0);
     }