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

Unified Diff: sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 737793006: Add compile flag for enabling the compostior (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cleanup Created 6 years, 1 month 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 | « sky/engine/core/rendering/compositing/RenderLayerCompositor.h ('k') | sky/engine/public/web/WebSettings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp b/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
index f8e87d802010fad20fbbf72003af5a3f42aedd54..15a9b52c7ad2228569fa564c429a85f020f4d929 100644
--- a/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -115,8 +115,11 @@ void RenderLayerCompositor::enableCompositingModeIfNeeded()
bool RenderLayerCompositor::rootShouldAlwaysComposite() const
{
- // FIXME(sky): Remove
+#if ENABLE(COMPOSITOR)
return true;
+#else
+ return false;
+#endif
}
void RenderLayerCompositor::updateAcceleratedCompositingSettings()
@@ -125,6 +128,15 @@ void RenderLayerCompositor::updateAcceleratedCompositingSettings()
m_rootShouldAlwaysCompositeDirty = true;
}
+bool RenderLayerCompositor::hasAcceleratedCompositing() const
+{
+#if ENABLE(COMPOSITOR)
+ return true;
+#else
+ return false;
+#endif
+}
+
bool RenderLayerCompositor::layerSquashingEnabled() const
{
if (!RuntimeEnabledFeatures::layerSquashingEnabled())
@@ -210,7 +222,9 @@ void RenderLayerCompositor::updateIfNeeded()
m_pendingUpdateType = CompositingUpdateNone;
if (!hasAcceleratedCompositing()) {
+#if ENABLE(COMPOSITOR)
updateWithoutAcceleratedCompositing(updateType);
+#endif
return;
}
« no previous file with comments | « sky/engine/core/rendering/compositing/RenderLayerCompositor.h ('k') | sky/engine/public/web/WebSettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698