Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1627)

Unified Diff: Source/core/rendering/RenderMultiColumnFlowThread.cpp

Issue 236913002: [New Multicolumn] Destroy line box tree when evacuating the flowthread for multicol. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code review Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/multicol/inline-children-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMultiColumnFlowThread.cpp
diff --git a/Source/core/rendering/RenderMultiColumnFlowThread.cpp b/Source/core/rendering/RenderMultiColumnFlowThread.cpp
index fcf0f3affb67448b9087849f6841599662ec927d..e44bfdb6a500ff6f43c2c01e83f19428b9aba1ea 100644
--- a/Source/core/rendering/RenderMultiColumnFlowThread.cpp
+++ b/Source/core/rendering/RenderMultiColumnFlowThread.cpp
@@ -83,6 +83,12 @@ void RenderMultiColumnFlowThread::evacuateAndDestroy()
multicolContainer->resetMultiColumnFlowThread();
moveAllChildrenTo(multicolContainer, true);
+ // FIXME: it's scary that neither destroy() nor the move*Children* methods take care of this,
+ // and instead leave you with dangling root line box pointers. But since this is how it is done
+ // in other parts of the code that deal with reparenting renderers, let's do the cleanup on our
+ // own here as well.
+ deleteLineBoxTree();
+
destroy();
}
« no previous file with comments | « LayoutTests/fast/multicol/inline-children-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698