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

Unified Diff: ui/compositor/compositor.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 | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | ui/compositor/compositor_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 4502661e12433a0cd6e2e22bec853a4c397c59f0..3eae5f50fa0695513a2f92be95144ebc2320af37 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -169,8 +169,8 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
// thread.
settings.image_decode_tasks_enabled = false;
- settings.use_compositor_animation_timelines =
- command_line->HasSwitch(switches::kUIEnableCompositorAnimationTimelines);
+ settings.use_compositor_animation_timelines = !command_line->HasSwitch(
+ switches::kUIDisableCompositorAnimationTimelines);
#if !defined(OS_ANDROID)
// TODO(sohanjg): Revisit this memory usage in tile manager.
« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | ui/compositor/compositor_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698