Chromium Code Reviews| 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( |