Fix scrollbar fade animation scheduling.

cc/trees/layer_tree_host_impl.cc

Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index ec59daebabffa8e7d12aef3499182558636e0290..54b845c664c84881ed34bc61ed5f82b947b7eb95 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1927,7 +1927,7 @@ void LayerTreeHostImpl::ScrollEnd() {
   if (top_controls_manager_)
     top_controls_manager_->ScrollEnd();
   ClearCurrentlyScrollingLayer();
-  StartScrollbarAnimation(CurrentFrameTimeTicks());
+  StartScrollbarAnimation();
 }
 
 InputHandler::ScrollStatus LayerTreeHostImpl::FlingScrollBegin() {
@@ -2199,9 +2199,9 @@ void LayerTreeHostImpl::AnimateScrollbarsRecursive(LayerImpl* layer,
     AnimateScrollbarsRecursive(layer->children()[i], time);
 }
 
-void LayerTreeHostImpl::StartScrollbarAnimation(base::TimeTicks time) {
+void LayerTreeHostImpl::StartScrollbarAnimation() {
   TRACE_EVENT0("cc", "LayerTreeHostImpl::StartScrollbarAnimation");
-  StartScrollbarAnimationRecursive(RootLayer(), time);
+  StartScrollbarAnimationRecursive(RootLayer(), CurrentPhysicalTimeTicks());
 }
 
 void LayerTreeHostImpl::StartScrollbarAnimationRecursive(LayerImpl* layer,
@@ -2241,10 +2241,11 @@ void LayerTreeHostImpl::ResetCurrentFrameTimeForNextFrame() {
   current_frame_time_ = base::Time();
 }
 
-static void UpdateCurrentFrameTime(base::TimeTicks* ticks, base::Time* now) {
+void LayerTreeHostImpl::UpdateCurrentFrameTime(base::TimeTicks* ticks,

[danakj, 2013/06/14 21:25:23]

nit: just pass in the LTHI and you don't have to add it to class etc.

[aelias_OOO_until_Jul13, 2013/06/14 22:19:02]

I think it makes more sense to add it to the class since the this pointer is the
natural way to do this, so leaving this as is.

+                                               base::Time* now) const {
   if (ticks->is_null()) {
     DCHECK(now->is_null());
-    *ticks = base::TimeTicks::Now();
+    *ticks = CurrentPhysicalTimeTicks();
     *now = base::Time::Now();
   }
 }
@@ -2259,6 +2260,10 @@ base::Time LayerTreeHostImpl::CurrentFrameTime() {
   return current_frame_time_;
 }
 
+base::TimeTicks LayerTreeHostImpl::CurrentPhysicalTimeTicks() const {
+  return base::TimeTicks::Now();
+}
+
 scoped_ptr<base::Value> LayerTreeHostImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   if (this->pending_tree_)