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

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

Issue 18601002: Add infrastructure for partial layouts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: define RenderObject::frameView in the header 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
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/SubtreeLayoutScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index e1ab0f869ed6606ca262ca9650157a4c85e83ece..2d5b99f6f472c8081a71bf0f9b58daad976d56d2 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -120,8 +120,13 @@ void RenderView::layoutContent(const LayoutState& state)
ASSERT(needsLayout());
RenderBlock::layout();
+
+ if (m_frameView->partialLayout().isStopping())
+ return;
+
if (hasRenderNamedFlowThreads())
flowThreadController()->layoutRenderNamedFlowThreads();
+
#ifndef NDEBUG
checkLayoutState(state);
#endif
@@ -212,6 +217,11 @@ bool RenderView::initializeLayoutState(LayoutState& state)
// as detected in the previous step.
void RenderView::layoutContentInAutoLogicalHeightRegions(const LayoutState& state)
{
+ if (!m_frameView->partialLayout().isStopping()) {
+ // Disable partial layout for any two-pass layout algorithm.
+ m_frameView->partialLayout().reset();
+ }
+
// We need to invalidate all the flows with auto-height regions if one such flow needs layout.
// If none is found we do a layout a check back again afterwards.
if (!flowThreadController()->updateFlowThreadsNeedingLayout()) {
@@ -280,6 +290,11 @@ void RenderView::layout()
else
layoutContent(state);
+ if (m_frameView->partialLayout().isStopping()) {
+ m_layoutState = 0;
+ return;
+ }
+
#ifndef NDEBUG
checkLayoutState(state);
#endif
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/SubtreeLayoutScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698