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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 406743002: Make PaintInvalidation a DocumentLifecyle state (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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/dom/DocumentLifecycle.cpp ('k') | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 5dfe396c492c156d84ea8364dfced26f23cce545..e33b5119b93628119c7f773c9ca3d176c221498d 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -2826,7 +2826,7 @@ void FrameView::updateLayoutAndStyleForPainting()
}
scrollContentsIfNeededRecursive();
- ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean);
+ ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
}
void FrameView::updateLayoutAndStyleIfNeededRecursive()
@@ -2882,7 +2882,9 @@ void FrameView::updateLayoutAndStyleIfNeededRecursive()
void FrameView::invalidateTreeIfNeededRecursive()
{
// FIXME: We should be more aggressive at cutting tree traversals.
+ lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation);
invalidateTreeIfNeeded();
+ lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
if (!child->isLocalFrame())
« no previous file with comments | « Source/core/dom/DocumentLifecycle.cpp ('k') | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698