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

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: address review comment 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
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/web/WebPagePopupImpl.h » ('j') | 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 8ae688b802b90d34a225ef46b51d2f5c68ea9fc0..909f4ffe8f4160049218f894d52e47a569ed226c 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()
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/web/WebPagePopupImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698