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

Unified Diff: ui/compositor/compositor.cc

Issue 986173002: Animations: Implement runtime flag for enabling compositor animation timelines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix codereview issues. Created 5 years, 9 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/renderer/gpu/render_widget_compositor.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 6293c2c19cf6d6e2fbb2fda6a548b18226e15cfa..17f47fb763165ebc3cb50d4770e73a150dd644f4 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -85,6 +85,7 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
cc::LayerTreeSettings settings;
+
danakj 2015/03/13 17:45:53 don't add unrelated whitespace change
loyso (OOO) 2015/03/15 23:29:22 Done.
// When impl-side painting is enabled, this will ensure PictureLayers always
// can have LCD text, to match the previous behaviour with ContentLayers,
// where LCD-not-allowed notifications were ignored.
@@ -130,9 +131,11 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
settings.impl_side_painting = IsUIImplSidePaintingEnabled();
- settings.use_zero_copy = IsUIZeroCopyEnabled();
- settings.use_one_copy = IsUIOneCopyEnabled();
+ settings.use_compositor_animation_timelines =
+ command_line->HasSwitch(switches::kUIEnableCompositorAnimationTimelines);
settings.use_image_texture_target = context_factory_->GetImageTextureTarget();
danakj 2015/03/13 17:45:53 please try to keep the diff minimal if it makes se
loyso (OOO) 2015/03/15 23:29:22 Done.
+ settings.use_one_copy = IsUIOneCopyEnabled();
+ settings.use_zero_copy = IsUIZeroCopyEnabled();
base::TimeTicks before_create = base::TimeTicks::Now();
host_ = cc::LayerTreeHost::CreateSingleThreaded(
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698