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

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

Issue 1896803002: Fix TextAutosizer not to scheduleRelayout() by MarkContainerChainInLayout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert RELEASE_ASSERT Created 4 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
Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index c0aad303287bdf85541f9cc27daca6cb021968be..0204a2614af5b3f66a06967dbaf95bdadfb5616a 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -748,23 +748,13 @@ static inline bool objectIsRelayoutBoundary(const LayoutObject* object)
return true;
}
-void LayoutObject::markContainerChainForLayout(bool scheduleRelayout)
-{
- markContainerChainForLayout(scheduleRelayout, nullptr);
-}
-
-void LayoutObject::markContainerChainForLayout(SubtreeLayoutScope* layouter)
-{
- // When we have a layouter, it means that we're in layout and we're marking
- // a descendant as needing layout with the intention of visiting it during
- // this layout. We shouldn't be scheduling it to be laid out later.
- markContainerChainForLayout(!layouter, layouter);
-}
-
void LayoutObject::markContainerChainForLayout(bool scheduleRelayout, SubtreeLayoutScope* layouter)
{
ASSERT(!isSetNeedsLayoutForbidden());
ASSERT(!layouter || this != layouter->root());
+ // When we have a layouter, it means that we're in layout and we're marking
+ // a descendant as needing layout with the intention of visiting it during
+ // this layout. We shouldn't be scheduling it to be laid out later.
ASSERT(!scheduleRelayout || !layouter);
LayoutObject* object = container();
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698