Animations: Implement runtime flag for enabling compositor animation timelines.

ui/compositor/compositor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 67 matching lines @@
       last_ended_frame_(0),
       disable_schedule_composite_(false),
       compositor_lock_(NULL),
       layer_animator_collection_(this),
       weak_ptr_factory_(this) {
   root_web_layer_ = cc::Layer::Create();
 
   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.
   settings.layers_always_allowed_lcd_text = true;
   settings.renderer_settings.refresh_rate =
       context_factory_->DoesCreateTestContexts() ? kTestRefreshRate
                                                  : kDefaultRefreshRate;
   settings.main_frame_before_activation_enabled = false;
   settings.throttle_frame_production =
       !command_line->HasSwitch(switches::kDisableGpuVsync);
@@ skipping 25 matching lines @@
       command_line->HasSwitch(cc::switches::kUIShowSurfaceDamageRects);
   settings.initial_debug_state.show_screen_space_rects =
       command_line->HasSwitch(cc::switches::kUIShowScreenSpaceRects);
   settings.initial_debug_state.show_replica_screen_space_rects =
       command_line->HasSwitch(cc::switches::kUIShowReplicaScreenSpaceRects);
 
   settings.initial_debug_state.SetRecordRenderingStats(
       command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
 
   settings.impl_side_painting = IsUIImplSidePaintingEnabled();
+  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 sense. here these were grouped
together because they are all impl-side painting flags.  can you leave them as
they were and just put this new one on its own?

[loyso (OOO), 2015/03/15 23:29:22]

Done.

+  settings.use_one_copy = IsUIOneCopyEnabled();
   settings.use_zero_copy = IsUIZeroCopyEnabled();
-  settings.use_one_copy = IsUIOneCopyEnabled();
-  settings.use_image_texture_target = context_factory_->GetImageTextureTarget();
 
   base::TimeTicks before_create = base::TimeTicks::Now();
   host_ = cc::LayerTreeHost::CreateSingleThreaded(
       this, this, context_factory_->GetSharedBitmapManager(),
       context_factory_->GetGpuMemoryBufferManager(), settings, task_runner_,
       nullptr);
   UMA_HISTOGRAM_TIMES("GPU.CreateBrowserCompositor",
                       base::TimeTicks::Now() - before_create);
   host_->SetRootLayer(root_web_layer_);
   host_->set_surface_id_namespace(surface_id_allocator_->id_namespace());
@@ skipping 228 matching lines @@
                     observer_list_,
                     OnCompositingLockStateChanged(this));
 }
 
 void Compositor::CancelCompositorLock() {
   if (compositor_lock_)
     compositor_lock_->CancelLock();
 }
 
 }  // namespace ui