Fix scrollbar fade animation scheduling.

cc/trees/layer_tree_host_impl.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_
 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 113 matching lines @@
                                        base::TimeDelta duration) OVERRIDE;
   virtual void ScheduleAnimation() OVERRIDE;
   virtual bool HaveTouchEventHandlersAt(gfx::Point viewport_port) OVERRIDE;
   virtual void SetLatencyInfoForInputEvent(const ui::LatencyInfo& latency_info)
       OVERRIDE;
 
   // TopControlsManagerClient implementation.
   virtual void DidChangeTopControlsPosition() OVERRIDE;
   virtual bool HaveRootScrollLayer() const OVERRIDE;
 
-  void StartScrollbarAnimation(base::TimeTicks now);
+  void StartScrollbarAnimation();
 
   struct CC_EXPORT FrameData : public RenderPassSink {
     FrameData();
     virtual ~FrameData();
 
     std::vector<gfx::Rect> occluding_screen_space_rects;
     std::vector<gfx::Rect> non_occluding_screen_space_rects;
     RenderPassList render_passes;
     RenderPassIdHashMap render_passes_by_id;
     const LayerImplList* render_surface_layer_list;
@@ skipping 218 matching lines @@
   }
 
   bool pinch_gesture_active() const { return pinch_gesture_active_; }
 
   void SetTreePriority(TreePriority priority);
 
   void ResetCurrentFrameTimeForNextFrame();
   base::TimeTicks CurrentFrameTimeTicks();
   base::Time CurrentFrameTime();
 
+  base::TimeTicks CurrentPhysicalTimeTicks() const;
+  void SetCurrentPhysicalTimeTicksForTest(base::TimeTicks fake_time);
+
   scoped_ptr<base::Value> AsValue() const;
   scoped_ptr<base::Value> ActivationStateAsValue() const;
 
   bool page_scale_animation_active() const { return !!page_scale_animation_; }
 
  protected:
   LayerTreeHostImpl(
       const LayerTreeSettings& settings,
       LayerTreeHostImplClient* client,
       Proxy* proxy,
@@ skipping 48 matching lines @@
 
   void AnimateScrollbarsRecursive(LayerImpl* layer,
                                   base::TimeTicks time);
 
   void DumpRenderSurfaces(std::string* str,
                           int indent,
                           const LayerImpl* layer) const;
 
   static LayerImpl* GetNonCompositedContentLayerRecursive(LayerImpl* layer);
 
+  void UpdateCurrentFrameTime(base::TimeTicks* ticks, base::Time* now) const;
+
   void StartScrollbarAnimationRecursive(LayerImpl* layer, base::TimeTicks time);
 
   scoped_ptr<OutputSurface> output_surface_;
 
   // |resource_provider_| and |tile_manager_| can be NULL, e.g. when using tile-
   // free rendering - see OutputSurface::ForcedDrawToSoftwareDevice().
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<TileManager> tile_manager_;
   scoped_ptr<Renderer> renderer_;
 
@@ skipping 69 matching lines @@
   // external_viewport_'s size takes precedence over device_viewport_size_ for
   // DrawQuad generation and Renderer; however, device_viewport_size_ is still
   // used for scrollable size.
   gfx::Transform external_transform_;
   gfx::Rect external_viewport_;
 
   gfx::Rect viewport_damage_rect_;
 
   base::TimeTicks current_frame_timeticks_;
   base::Time current_frame_time_;
+  base::TimeTicks fake_current_physical_time_for_test_;
 
   scoped_ptr<AnimationRegistrar> animation_registrar_;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_IMPL_H_