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

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

Issue 18601002: Add infrastructure for partial layouts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Change how reentrant scrollbar code works, change test to prove it works Created 7 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
Index: Source/core/rendering/SubtreeLayoutScope.cpp
diff --git a/Source/core/rendering/SubtreeLayoutScope.cpp b/Source/core/rendering/SubtreeLayoutScope.cpp
index 7a35c5daf865277774ca5beecb2f873a1c2cc088..716421fa79da37935cb3ba4fce314e52f31cad64 100644
--- a/Source/core/rendering/SubtreeLayoutScope.cpp
+++ b/Source/core/rendering/SubtreeLayoutScope.cpp
@@ -44,6 +44,12 @@ SubtreeLayoutScope::SubtreeLayoutScope(RenderObject* root)
SubtreeLayoutScope::~SubtreeLayoutScope()
{
+ // Partial layout early-exits layout and will leave the tree as needing layout.
+ if (m_root->frameView()->partialLayout().isStopping()) {
+ ASSERT(m_root->needsLayout());
+ return;
+ }
+
RELEASE_ASSERT(!m_root->needsLayout());
#ifndef NDEBUG

Powered by Google App Engine
This is Rietveld 408576698