Changeset 205479 in webkit

Timestamp:

Sep 6, 2016 9:00:11 AM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: !currBox->needsLayout() in WebCore::RenderBlock::checkPositionedObjectsNeedLayout
​https://bugs.webkit.org/show_bug.cgi?id=120291
<rdar://problem/27683456>

Reviewed by David Hyatt.

Source/WebCore:

This patch ensures that we always set the 'positioned child needs layout' bit on the containing block
when a new positioned descendant gets inserted. It fixes cases for simplified layout when
we ended up not laying out the descendant element.

Test: fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::insertPositionedObject):

LayoutTests:

• fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out-expected.txt: Added.
• fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out-expected.txt (added)
• LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-06  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !currBox->needsLayout() in WebCore::RenderBlock::checkPositionedObjectsNeedLayout
+        https://bugs.webkit.org/show_bug.cgi?id=120291
+        <rdar://problem/27683456>
+
+        Reviewed by David Hyatt.
+
+        * fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out-expected.txt: Added.
+        * fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html: Added.
+
 2016-09-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-06  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !currBox->needsLayout() in WebCore::RenderBlock::checkPositionedObjectsNeedLayout
+        https://bugs.webkit.org/show_bug.cgi?id=120291
+        <rdar://problem/27683456>
+
+        Reviewed by David Hyatt.
+
+        This patch ensures that we always set the 'positioned child needs layout' bit on the containing block
+        when a new positioned descendant gets inserted. It fixes cases for simplified layout when
+        we ended up not laying out the descendant element. 
+
+        Test: fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::insertPositionedObject):
+
 2016-09-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2254 +2254 @@
     if (positioned.isRenderFlowThread())
         return;
-
+    // We should turn this bit on only while in layout.
+    ASSERT(posChildNeedsLayout() || view().frameView().isInLayout());
+    setPosChildNeedsLayoutBit(true);
     positionedDescendantsMap().addDescendant(*this, positioned, isRenderView() ? PositionedDescendantsMap::MoveDescendantToEnd::Yes
         : PositionedDescendantsMap::MoveDescendantToEnd::No);