Title: [222881] trunk/Source/WebCore
- Revision
- 222881
- Author
- [email protected]
- Date
- 2017-10-04 14:29:50 -0700 (Wed, 04 Oct 2017)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222880 => 222881)
--- trunk/Source/WebCore/ChangeLog 2017-10-04 21:15:32 UTC (rev 222880)
+++ trunk/Source/WebCore/ChangeLog 2017-10-04 21:29:50 UTC (rev 222881)
@@ -1,5 +1,21 @@
2017-10-04 Zalan Bujtas <[email protected]>
+ 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 <[email protected]>
+
RenderMultiColumnFlow::m_beingEvacuated is redundant.
https://bugs.webkit.org/show_bug.cgi?id=177886
<rdar://problem/34815997>
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp (222880 => 222881)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp 2017-10-04 21:15:32 UTC (rev 222880)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp 2017-10-04 21:29:50 UTC (rev 222881)
@@ -149,7 +149,6 @@
// 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 @@
// 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.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
