Title: [205479] trunk
Revision
205479
Author
[email protected]
Date
2016-09-06 09:00:11 -0700 (Tue, 06 Sep 2016)

Log 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.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (205478 => 205479)


--- trunk/LayoutTests/ChangeLog	2016-09-06 14:32:02 UTC (rev 205478)
+++ trunk/LayoutTests/ChangeLog	2016-09-06 16:00:11 UTC (rev 205479)
@@ -1,3 +1,14 @@
+2016-09-06  Zalan Bujtas  <[email protected]>
+
+        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  <[email protected]>
 
         W3C test importer should be able to identify slow test

Added: trunk/LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out-expected.txt (0 => 205479)


--- trunk/LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out-expected.txt	2016-09-06 16:00:11 UTC (rev 205479)
@@ -0,0 +1,3 @@
+PASS if no assert in debug.
+
+

Added: trunk/LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html (0 => 205479)


--- trunk/LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html	                        (rev 0)
+++ trunk/LayoutTests/fast/block/positioning/assert-when-positioned-descendant-is-not-getting-laid-out.html	2016-09-06 16:00:11 UTC (rev 205479)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we properly layout positioned descendants.</title>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+
+window._onload_ = function() {
+  document.execCommand('selectAll');
+  document.designMode = 'on';
+}
+</script>
+<style>
+html, caption, tfoot, button {
+    display: inline-flex;
+    position: absolute;
+    flex-direction: row-reverse;
+}
+
+tfoot {
+    position: relative;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<table><caption></caption><tfoot><tr><th><button><span></span></button></th></tr></tfoot></table>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (205478 => 205479)


--- trunk/Source/WebCore/ChangeLog	2016-09-06 14:32:02 UTC (rev 205478)
+++ trunk/Source/WebCore/ChangeLog	2016-09-06 16:00:11 UTC (rev 205479)
@@ -1,3 +1,20 @@
+2016-09-06  Zalan Bujtas  <[email protected]>
+
+        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  <[email protected]>
 
         CachedResourceLoader is not taking into account fetch options to use or not cached resources

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (205478 => 205479)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2016-09-06 14:32:02 UTC (rev 205478)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2016-09-06 16:00:11 UTC (rev 205479)
@@ -2253,7 +2253,9 @@
 
     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);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to