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

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

Issue 324513003: Simplify RenderLayerCompositor::rootShouldAlwaysComposite (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 1e69907e7455d5865033e833128c907696e937b9..cdb6254e817688b0feac7ac302de1fbeec477954 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -190,9 +190,9 @@ bool RenderLayerCompositor::compositingLayersNeedRebuild()
bool RenderLayerCompositor::rootShouldAlwaysComposite() const
{
- if (m_hasAcceleratedCompositing && !m_renderView.frame()->isMainFrame())
- return m_compositingReasonFinder.requiresCompositingForScrollableFrame();
- return m_hasAcceleratedCompositing;
+ if (!m_hasAcceleratedCompositing)
+ return false;
+ return m_renderView.frame()->isMainFrame() || m_compositingReasonFinder.requiresCompositingForScrollableFrame();
}
void RenderLayerCompositor::updateAcceleratedCompositingSettings()
« 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