Changeset 123211 in webkit

Timestamp:

Jul 20, 2012 6:59:48 AM (12 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions]Assert failure when layout positioned objects in regions
​https://bugs.webkit.org/show_bug.cgi?id=90792

Reviewed by Andreas Kling.

Before clamping the containing block (for an out-of-flow positioned element
inside a named flow) to the region, we have to test whether the region is not
null, which can happen when the named flow does not have attached regions.

Source/WebCore:

Tests: fast/regions/positioned-vrl-in-named-flow.html

fast/regions/positioned-vrl-in-parent-named-flow.html
fast/regions/positioned-with-vrl-parent-in-named-flow.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::containingBlockLogicalWidthForPositioned):
(WebCore::RenderBox::computePositionedLogicalWidth):
(WebCore::RenderBox::computePositionedLogicalHeight):

LayoutTests:

• fast/regions/positioned-vrl-in-named-flow-expected.txt: Added.
• fast/regions/positioned-vrl-in-named-flow.html: Added.
• fast/regions/positioned-vrl-in-parent-named-flow-expected.txt: Added.
• fast/regions/positioned-vrl-in-parent-named-flow.html: Added.
• fast/regions/positioned-with-vrl-parent-in-named-flow-expected.txt: Added.
• fast/regions/positioned-with-vrl-parent-in-named-flow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/positioned-vrl-in-named-flow-expected.txt (added)
• LayoutTests/fast/regions/positioned-vrl-in-named-flow.html (added)
• LayoutTests/fast/regions/positioned-vrl-in-parent-named-flow-expected.txt (added)
• LayoutTests/fast/regions/positioned-vrl-in-parent-named-flow.html (added)
• LayoutTests/fast/regions/positioned-with-vrl-parent-in-named-flow-expected.txt (added)
• LayoutTests/fast/regions/positioned-with-vrl-parent-in-named-flow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-20  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Assert failure when layout positioned objects in regions
+        https://bugs.webkit.org/show_bug.cgi?id=90792
+
+        Reviewed by Andreas Kling.
+
+        Before clamping the containing block (for an out-of-flow positioned element
+        inside a named flow) to the region, we have to test whether the region is not
+        null, which can happen when the named flow does not have attached regions.
+
+        * fast/regions/positioned-vrl-in-named-flow-expected.txt: Added.
+        * fast/regions/positioned-vrl-in-named-flow.html: Added.
+        * fast/regions/positioned-vrl-in-parent-named-flow-expected.txt: Added.
+        * fast/regions/positioned-vrl-in-parent-named-flow.html: Added.
+        * fast/regions/positioned-with-vrl-parent-in-named-flow-expected.txt: Added.
+        * fast/regions/positioned-with-vrl-parent-in-named-flow.html: Added.
+
 2012-07-20  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-20  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Assert failure when layout positioned objects in regions
+        https://bugs.webkit.org/show_bug.cgi?id=90792
+
+        Reviewed by Andreas Kling.
+
+        Before clamping the containing block (for an out-of-flow positioned element
+        inside a named flow) to the region, we have to test whether the region is not
+        null, which can happen when the named flow does not have attached regions.
+
+        Tests: fast/regions/positioned-vrl-in-named-flow.html
+               fast/regions/positioned-vrl-in-parent-named-flow.html
+               fast/regions/positioned-with-vrl-parent-in-named-flow.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::containingBlockLogicalWidthForPositioned):
+        (WebCore::RenderBox::computePositionedLogicalWidth):
+        (WebCore::RenderBox::computePositionedLogicalHeight):
+
 2012-07-20  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2366 +2366 @@
                     LayoutUnit cbPageOffset = offsetFromLogicalTopOfFirstPage - logicalTop();
                     RenderRegion* cbRegion = cb->regionAtBlockOffset(cbPageOffset);
-                    cbRegion = cb->clampToStartAndEndRegions(cbRegion);
-                    boxInfo = cb->renderBoxRegionInfo(cbRegion, cbPageOffset);
+                    if (cbRegion) {
+                        cbRegion = cb->clampToStartAndEndRegions(cbRegion);
+                        boxInfo = cb->renderBoxRegionInfo(cbRegion, cbPageOffset);
+                    }
                 }
             } else if (region && enclosingRenderFlowThread()->isHorizontalWritingMode() == containingBlock->isHorizontalWritingMode()) {
@@ -2629 +2631 @@
         LayoutUnit cbPageOffset = offsetFromLogicalTopOfFirstPage - logicalTop();
         RenderRegion* cbRegion = cb->regionAtBlockOffset(cbPageOffset);
-        cbRegion = cb->clampToStartAndEndRegions(cbRegion);
-        RenderBoxRegionInfo* boxInfo = cb->renderBoxRegionInfo(cbRegion, cbPageOffset);
-        if (boxInfo) {
-            logicalLeftPos += boxInfo->logicalLeft();
-            setLogicalLeft(logicalLeftPos);
+        if (cbRegion) {
+            cbRegion = cb->clampToStartAndEndRegions(cbRegion);
+            RenderBoxRegionInfo* boxInfo = cb->renderBoxRegionInfo(cbRegion, cbPageOffset);
+            if (boxInfo) {
+                logicalLeftPos += boxInfo->logicalLeft();
+                setLogicalLeft(logicalLeftPos);
+            }
         }
     }
@@ -2951 +2955 @@
         LayoutUnit cbPageOffset = cb->offsetFromLogicalTopOfFirstPage() - logicalLeft();
         RenderRegion* cbRegion = cb->regionAtBlockOffset(cbPageOffset);
-        cbRegion = cb->clampToStartAndEndRegions(cbRegion);
-        RenderBoxRegionInfo* boxInfo = cb->renderBoxRegionInfo(cbRegion, cbPageOffset);
-        if (boxInfo) {
-            logicalTopPos += boxInfo->logicalLeft();
-            setLogicalTop(logicalTopPos);
+        if (cbRegion) {
+            cbRegion = cb->clampToStartAndEndRegions(cbRegion);
+            RenderBoxRegionInfo* boxInfo = cb->renderBoxRegionInfo(cbRegion, cbPageOffset);
+            if (boxInfo) {
+                logicalTopPos += boxInfo->logicalLeft();
+                setLogicalTop(logicalTopPos);
+            }
         }
     }