Scrollbar fade animation broken on Android regression resolved.

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 <stddef.h>
 
 #include <bitset>
@@ skipping 113 matching lines @@
   virtual void DidCompletePageScaleAnimationOnImplThread() = 0;
 
   // Called when output surface asks for a draw.
   virtual void OnDrawForCompositorFrameSink(
       bool resourceless_software_draw) = 0;
 
  protected:
   virtual ~LayerTreeHostImplClient() {}
 };
 
+// Used to cache scroll related variables that get reset while clearing
+// the currently scrolling layer. Cached values are restored in case of a
+// scrollBegin in inertial phase (fling) to latch the fling to its
+// corresponding scroll event.
+class ScrollingVariablesState {
+ public:
+  ScrollingVariablesState() {
+    ScrollingVariablesState(false, false, gfx::Vector2dF());
+  }
+  ScrollingVariablesState(bool did_lock_scrolling_layer,
+                          bool scroll_affects_scroll_handler,
+                          gfx::Vector2dF accumulated_root_overscroll)
+      : did_lock_scrolling_layer_(did_lock_scrolling_layer),
+        scroll_affects_scroll_handler_(scroll_affects_scroll_handler),
+        accumulated_root_overscroll_(accumulated_root_overscroll) {}
+
+  bool didLockScrollingLayer() { return did_lock_scrolling_layer_; }
+  bool scrollAffectsScrollHandler() { return scroll_affects_scroll_handler_; }
+  gfx::Vector2dF accumulatedRootOverscroll() {
+    return accumulated_root_overscroll_;
+  }
+
+ private:
+  bool did_lock_scrolling_layer_;
+  bool scroll_affects_scroll_handler_;
+  gfx::Vector2dF accumulated_root_overscroll_;
+};
+
 // LayerTreeHostImpl owns the LayerImpl trees as well as associated rendering
 // state.
 class CC_EXPORT LayerTreeHostImpl
     : public InputHandler,
       public TileManagerClient,
       public CompositorFrameSinkClient,
       public TopControlsManagerClient,
       public ScrollbarAnimationControllerClient,
       public VideoFrameControllerClient,
       public LayerTreeMutatorClient,
@@ skipping 550 matching lines @@
 
   void ScrollAnimationAbort(LayerImpl* layer_impl);
 
   bool ScrollAnimationUpdateTarget(ScrollNode* scroll_node,
                                    const gfx::Vector2dF& scroll_delta,
                                    base::TimeDelta delayed_by);
 
   void SetCompositorContextVisibility(bool is_visible);
   void SetWorkerContextVisibility(bool is_visible);
 
+  // Cache & restore variables that get reset in ClearCurrentlyScrollingLayer.
+  // This is used to restore the variables' values in a scrollBegin event
+  // that is in inertial phase (a fling) to latch the event to its
+  // corresponding scroller.
+  void CacheScrollingVariablesState();
+  void RestoreCachedScrollingVariablesState();
+
   using UIResourceMap = std::unordered_map<UIResourceId, UIResourceData>;
   UIResourceMap ui_resource_map_;
 
   // Resources that were evicted by EvictAllUIResources. Resources are removed
   // from this when they are touched by a create or destroy from the UI resource
   // request queue.
   std::set<UIResourceId> evicted_ui_resources_;
 
   CompositorFrameSink* compositor_frame_sink_;
 
@@ skipping 120 matching lines @@
   // it's lost instead of having this bool.
   bool has_valid_compositor_frame_sink_;
 
   std::unique_ptr<Viewport> viewport_;
 
   std::unique_ptr<LayerTreeMutator> mutator_;
 
   std::unique_ptr<PendingTreeDurationHistogramTimer>
       pending_tree_duration_timer_;
 
+  ScrollingVariablesState cached_scrolling_variables_state_;
+
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_IMPL_H_