Fix scrollbar fade animation scheduling.

cc/layers/layer_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/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/strings/stringprintf.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/scrollbar_animation_controller.h"
@@ skipping 859 matching lines @@
         viewport.height() / scrollable_size.height());
   }
 
   if (current_offset == last_scroll_offset_)
     return;
   last_scroll_offset_ = current_offset;
 
   if (scrollbar_animation_controller_ &&
       !scrollbar_animation_controller_->IsScrollGestureInProgress()) {
     scrollbar_animation_controller_->DidProgrammaticallyUpdateScroll(
-        layer_tree_impl()->CurrentFrameTimeTicks());
+        base::TimeTicks::Now());
   }
 
   // Get the current_offset_.y() value for a sanity-check on scrolling
   // benchmark metrics. Specifically, we want to make sure
   // BasicMouseWheelSmoothScrollGesture has proper scroll curves.
   if (layer_tree_impl()->IsActiveTree()) {
     TRACE_COUNTER_ID1("gpu", "scroll_offset_y", this->id(), current_offset.y());
   }
 }
 
@@ skipping 87 matching lines @@
   UpdateScrollbarPositions();
 }
 
 void LayerImpl::SetScrollbarOpacity(float opacity) {
   if (horizontal_scrollbar_layer_)
     horizontal_scrollbar_layer_->SetOpacity(opacity);
   if (vertical_scrollbar_layer_)
     vertical_scrollbar_layer_->SetOpacity(opacity);
 }
 
-inline scoped_ptr<ScrollbarAnimationController>
-CreateScrollbarAnimationControllerWithFade(LayerImpl* layer) {
-  base::TimeDelta fadeout_delay = base::TimeDelta::FromMilliseconds(300);
-  base::TimeDelta fadeout_length = base::TimeDelta::FromMilliseconds(300);
-  return ScrollbarAnimationControllerLinearFade::Create(
-      layer, fadeout_delay, fadeout_length)
-      .PassAs<ScrollbarAnimationController>();
-}
-
 void LayerImpl::DidBecomeActive() {
   if (!layer_tree_impl_->settings().use_linear_fade_scrollbar_animator)
     return;
 
   bool need_scrollbar_animation_controller = horizontal_scrollbar_layer_ ||
                                              vertical_scrollbar_layer_;
   if (need_scrollbar_animation_controller) {
     if (!scrollbar_animation_controller_) {
+      base::TimeDelta fadeout_delay = base::TimeDelta::FromMilliseconds(
+          layer_tree_impl_->settings().scrollbar_linear_fade_delay_ms);
+      base::TimeDelta fadeout_length = base::TimeDelta::FromMilliseconds(
+          layer_tree_impl_->settings().scrollbar_linear_fade_length_ms);
       scrollbar_animation_controller_ =
-          CreateScrollbarAnimationControllerWithFade(this);
+          ScrollbarAnimationControllerLinearFade::Create(
+              this, fadeout_delay, fadeout_length)
+              .PassAs<ScrollbarAnimationController>();
     }
   } else {
     scrollbar_animation_controller_.reset();
   }
 }
 void LayerImpl::SetHorizontalScrollbarLayer(
     ScrollbarLayerImpl* scrollbar_layer) {
   horizontal_scrollbar_layer_ = scrollbar_layer;
   if (horizontal_scrollbar_layer_)
     horizontal_scrollbar_layer_->set_scroll_layer_id(id());
@@ skipping 154 matching lines @@
 
 size_t LayerImpl::GPUMemoryUsageInBytes() const { return 0; }
 
 scoped_ptr<base::Value> LayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   AsValueInto(state.get());
   return state.PassAs<base::Value>();
 }
 
 }  // namespace cc