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

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: If text autosizing is enabled, only partial layout for the second of two layouts Created 7 years, 4 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 c3bfefe745a64383618009fb6e6b9e43b7744e81..fbc0c76cbad825080afd37890e5d4ff8365cf823 100644
--- a/Source/core/rendering/SubtreeLayoutScope.cpp
+++ b/Source/core/rendering/SubtreeLayoutScope.cpp
@@ -44,17 +44,19 @@ SubtreeLayoutScope::SubtreeLayoutScope(RenderObject* root)
SubtreeLayoutScope::~SubtreeLayoutScope()
{
- RELEASE_ASSERT(!m_root->needsLayout());
+ if (!m_root->document()->view()->shouldStopPartialLayout()) {
esprehn 2013/08/18 03:43:15 This should be an early return.
pdr. 2013/08/20 06:19:10 Done.
+ RELEASE_ASSERT(!m_root->needsLayout());
#ifndef NDEBUG
- for (HashSet<RenderObject*>::iterator it = m_renderersToLayout.begin(); it != m_renderersToLayout.end(); ++it) {
- RenderObject* renderer = *it;
- // FIXME: Thie patter is really common. Move it into an assertRendererLaidOut function.
- if (renderer->needsLayout())
- showRenderTree(renderer);
- ASSERT(!renderer->needsLayout());
- }
+ for (HashSet<RenderObject*>::iterator it = m_renderersToLayout.begin(); it != m_renderersToLayout.end(); ++it) {
+ RenderObject* renderer = *it;
+ // FIXME: Thie patter is really common. Move it into an assertRendererLaidOut function.
+ if (renderer->needsLayout())
+ showRenderTree(renderer);
+ ASSERT(!renderer->needsLayout());
+ }
#endif
+ }
}
void SubtreeLayoutScope::setNeedsLayout(RenderObject* descendant)

Powered by Google App Engine
This is Rietveld 408576698