Merge Compositor's ScrollbarAnimationControllers into single class

cc/trees/layer_tree_impl.cc

 // Copyright 2011 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 "cc/trees/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <iterator>
 #include <limits>
 #include <set>
 
 #include "base/containers/adapters.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/histograms.h"
 #include "cc/base/math_util.h"
 #include "cc/base/synced_property.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/traced_value.h"
 #include "cc/input/page_scale_animation.h"
 #include "cc/input/scrollbar_animation_controller.h"
-#include "cc/input/scrollbar_animation_controller_linear_fade.h"
-#include "cc/input/scrollbar_animation_controller_thinning.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/layer_list_iterator.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/layers/scrollbar_layer_impl_base.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/resources/ui_resource_request.h"
 #include "cc/trees/clip_node.h"
 #include "cc/trees/draw_property_utils.h"
@@ skipping 1332 matching lines @@
 }
 
 std::unique_ptr<ScrollbarAnimationController>
 LayerTreeImpl::CreateScrollbarAnimationController(int scroll_layer_id) {
   DCHECK(!settings().scrollbar_fade_delay.is_zero());
   DCHECK(!settings().scrollbar_fade_duration.is_zero());
   base::TimeDelta delay = settings().scrollbar_fade_delay;
   base::TimeDelta resize_delay = settings().scrollbar_fade_resize_delay;
   base::TimeDelta fade_duration = settings().scrollbar_fade_duration;
   switch (settings().scrollbar_animator) {
     case LayerTreeSettings::LINEAR_FADE: {

[chaopeng, 2017/02/15 19:59:50]

I agree change name to ScrollbarAnimationControllerOverlay vs
ScrollbarAnimationControllerAndroid would be better. But should we also change
the LayerTreeSettings?

[weiliangc, 2017/02/15 20:06:08]

Yeah sounds good. Make sure to comment there too.

-      return ScrollbarAnimationControllerLinearFade::Create(
-          scroll_layer_id, layer_tree_host_impl_, delay, resize_delay,
-          fade_duration);
+      return ScrollbarAnimationController::
+          CreateScrollbarAnimationControllerLinearFade(
+              scroll_layer_id, layer_tree_host_impl_, delay, resize_delay,
+              fade_duration);
     }
     case LayerTreeSettings::THINNING: {
       base::TimeDelta thinning_duration =
           settings().scrollbar_thinning_duration;
-      return ScrollbarAnimationControllerThinning::Create(
-          scroll_layer_id, layer_tree_host_impl_, delay, resize_delay,
-          fade_duration, thinning_duration);
+      return ScrollbarAnimationController::
+          CreateScrollbarAnimationControllerThinning(
+              scroll_layer_id, layer_tree_host_impl_, delay, resize_delay,
+              fade_duration, thinning_duration);
     }
     case LayerTreeSettings::NO_ANIMATOR:
       NOTREACHED();
       break;
   }
   return nullptr;
 }
 
 void LayerTreeImpl::DidAnimateScrollOffset() {
   layer_tree_host_impl_->DidAnimateScrollOffset();
@@ skipping 691 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc