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

Unified Diff: ui/compositor/layer.cc

Issue 1536833004: CC Animations: Enable external animation host for ui::Compositor (Aura) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@player2animator
Patch Set: Rebase. Created 5 years 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 | « ui/compositor/compositor_switches.cc ('k') | ui/compositor/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index cfa0dc293653320c85bf1671fba99ec7abef0951..e5569d0ff63b8f515ce73594201a4667c8ddcd20 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -132,8 +132,9 @@ const cc::LayerSettings& Layer::UILayerSettings() {
// static
void Layer::InitializeUILayerSettings() {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(switches::kUIEnableCompositorAnimationTimelines))
- g_ui_layer_settings.Get().use_compositor_animation_timelines = true;
+ g_ui_layer_settings.Get().use_compositor_animation_timelines =
+ !command_line->HasSwitch(
+ switches::kUIDisableCompositorAnimationTimelines);
}
const Compositor* Layer::GetCompositor() const {
« no previous file with comments | « ui/compositor/compositor_switches.cc ('k') | ui/compositor/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698