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

Unified Diff: Source/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 236193002: Early return in RenderLayerCompositor::updateForceCompositingMode. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index 36ca9aea7e5aecf81851574b24ee3f1d683a3f83..bea72b7c41d00b77b800d08482db6a03892cc551 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -150,8 +150,14 @@ void RenderLayerCompositor::updateForceCompositingMode()
// FIXME: Can settings really be null here?
if (Settings* settings = m_renderView.document().settings()) {
bool forceCompositingMode = settings->forceCompositingMode() && m_hasAcceleratedCompositing;
- if (forceCompositingMode && !isMainFrame())
+ if (forceCompositingMode && !isMainFrame()) {
+ // requiresCompositingForScrollableFrame will return a stale value if the RenderView
+ // needsLayout. Skip updating m_forceCompositingMode here as we'll call back into
+ // this method at the end of layout.
+ if (m_renderView.needsLayout())
+ return;
forceCompositingMode = m_compositingReasonFinder.requiresCompositingForScrollableFrame();
+ }
if (forceCompositingMode != m_forceCompositingMode) {
setCompositingLayersNeedRebuild();
m_forceCompositingMode = forceCompositingMode;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698