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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1398713002: Revert of CC Animations: Enable external animation host for blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « content/public/common/content_switches.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 04df33c04d8889501f8360aa11efb148980fbdb6..2e9773552cc73afeda3562bab5972679ea79ebcc 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -246,10 +246,10 @@
settings.accelerated_animation_enabled =
compositor_deps_->IsThreadedAnimationEnabled();
- settings.use_compositor_animation_timelines =
- !cmd->HasSwitch(switches::kDisableCompositorAnimationTimelines);
- blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(
- settings.use_compositor_animation_timelines);
+ if (cmd->HasSwitch(switches::kEnableCompositorAnimationTimelines)) {
+ settings.use_compositor_animation_timelines = true;
+ blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true);
+ }
settings.default_tile_size = CalculateDefaultTileSize(widget_);
if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698