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

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

Issue 19782002: Make Blink stop scheduling its own Layout, and use the compositor's timer instead (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: With test changes Created 7 years, 5 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/page/FrameView.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderIFrame.cpp
diff --git a/Source/core/rendering/RenderIFrame.cpp b/Source/core/rendering/RenderIFrame.cpp
index a4b649a2d7b4fd4954834ff58108f0d548bb99ed..83acd5929ce63d0d4d9098b58bb9943bb803a867 100644
--- a/Source/core/rendering/RenderIFrame.cpp
+++ b/Source/core/rendering/RenderIFrame.cpp
@@ -115,7 +115,7 @@ void RenderIFrame::layoutSeamlessly()
// Assert that the child document did a complete layout.
RenderView* childRoot = childFrameView ? childFrameView->frame()->contentRenderer() : 0;
- ASSERT(!childFrameView || !childFrameView->layoutPending());
+ ASSERT(!childFrameView || !childFrameView->layoutIsScheduledWithEmbedder());
ASSERT_UNUSED(childRoot, !childRoot || !childRoot->needsLayout());
}
« no previous file with comments | « Source/core/page/FrameView.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698