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

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

Issue 295383008: Remove the forceCompositingMode setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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
Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index 435b95f03c62af86d2da469ecb0fba47739a31ba..09f748cef5eaebb27f0a81c149d9b50b67ab5e88 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -183,11 +183,9 @@ bool RenderLayerCompositor::compositingLayersNeedRebuild()
bool RenderLayerCompositor::rootShouldAlwaysComposite() const
{
- Settings* settings = m_renderView.document().settings();
- bool shouldComposite = settings->forceCompositingMode() && m_hasAcceleratedCompositing;
- if (shouldComposite && !m_renderView.frame()->isMainFrame())
+ if (m_hasAcceleratedCompositing && !m_renderView.frame()->isMainFrame())
return m_compositingReasonFinder.requiresCompositingForScrollableFrame();
- return shouldComposite;
+ return m_hasAcceleratedCompositing;
}
void RenderLayerCompositor::updateAcceleratedCompositingSettings()

Powered by Google App Engine
This is Rietveld 408576698