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

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

Issue 927773002: Keep track of multiple layout roots (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add bug link Created 5 years, 10 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 | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutObject.cpp
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
index 238e02d46e581a95b6786f15c9a774c04350bc53..47bcfaa565a52616deb28cad81f70472d5dfed0e 100644
--- a/Source/core/layout/LayoutObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -2279,17 +2279,9 @@ bool LayoutObject::isSelectionBorder() const
inline void LayoutObject::clearLayoutRootIfNeeded() const
{
- if (frame()) {
- if (FrameView* view = frame()->view()) {
- if (view->layoutRoot() == this) {
- if (!documentBeingDestroyed())
- ASSERT_NOT_REACHED();
- // This indicates a failure to layout the child, which is why
- // the layout root is still set to |this|. Make sure to clear it
- // since we are getting destroyed.
- view->clearLayoutSubtreeRoot();
- }
- }
+ if (FrameView* view = frameView()) {
+ if (!documentBeingDestroyed())
+ view->clearLayoutSubtreeRoot(*this);
}
}
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698