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

Unified Diff: Source/core/layout/LayoutMultiColumnFlowThread.cpp

Issue 1311023003: No longer any need to delete the line box tree on our own. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: code review Created 5 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnFlowThread.cpp
diff --git a/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
index 478f89d9d701fd067c66d0e799cfbdb7284497dc..7cc0c14770975a2ae3d149b00492a7dad984176b 100644
--- a/Source/core/layout/LayoutMultiColumnFlowThread.cpp
+++ b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
@@ -255,11 +255,9 @@ void LayoutMultiColumnFlowThread::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 layoutObjects, let's do the cleanup on our
- // own here as well.
- deleteLineBoxTree();
+ // We used to manually nuke the line box tree here, but that should happen automatically when
+ // moving children around (the code above).
+ ASSERT(!firstLineBox());
destroy();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698