RenderMultiColumnFlow populate/evacuate should not disable layout state.
authorzalan@apple.com <zalan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Oct 2017 21:29:50 +0000 (21:29 +0000)
committerzalan@apple.com <zalan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Oct 2017 21:29:50 +0000 (21:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177894
<rdar://problem/34818696>

Reviewed by Antti Koivisto.

Populate/evacuate methods are not called at layout time.

Covered by existing tests.

* rendering/RenderMultiColumnFlow.cpp:
(WebCore::RenderMultiColumnFlow::populate):
(WebCore::RenderMultiColumnFlow::evacuateAndDestroy):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@222881 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderMultiColumnFlow.cpp

index e1c56c9..9904bfe 100644 (file)
@@ -1,5 +1,21 @@
 2017-10-04  Zalan Bujtas  <zalan@apple.com>
 
+        RenderMultiColumnFlow populate/evacuate should not disable layout state.
+        https://bugs.webkit.org/show_bug.cgi?id=177894
+        <rdar://problem/34818696>
+
+        Reviewed by Antti Koivisto.
+
+        Populate/evacuate methods are not called at layout time.
+
+        Covered by existing tests.
+
+        * rendering/RenderMultiColumnFlow.cpp:
+        (WebCore::RenderMultiColumnFlow::populate):
+        (WebCore::RenderMultiColumnFlow::evacuateAndDestroy):
+
+2017-10-04  Zalan Bujtas  <zalan@apple.com>
+
         RenderMultiColumnFlow::m_beingEvacuated is redundant.
         https://bugs.webkit.org/show_bug.cgi?id=177886
         <rdar://problem/34815997>
index a67df60..03dcc53 100644 (file)
@@ -149,7 +149,6 @@ void RenderMultiColumnFlow::populate()
     // Reparent children preceding the flow thread into the flow thread. It's multicol content
     // now. At this point there's obviously nothing after the flow thread, but renderers (column
     // sets and spanners) will be inserted there as we insert elements into the flow thread.
-    LayoutStateDisabler layoutStateDisabler(view());
     multicolContainer->moveChildrenTo(this, multicolContainer->firstChild(), this, true);
     
     if (multicolContainer->isFieldset()) {
@@ -167,8 +166,6 @@ void RenderMultiColumnFlow::evacuateAndDestroy()
     // Delete the line box tree.
     deleteLines();
     
-    LayoutStateDisabler layoutStateDisabler(view());
-
     // First promote all children of the flow thread. Before we move them to the flow thread's
     // container, we need to unregister the flow thread, so that they aren't just re-added again to
     // the flow thread that we're trying to empty.