Track the currently scrolling ScrollNode instead of the scrolling layer

cc/trees/layer_tree_host_impl.h

Index: cc/trees/layer_tree_host_impl.h
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 0787f7f49b5b8991365581dc767bfc0babcbe3f8..5a110ecbeabd8b91a9f16e6fec06aad11d1eb875 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -434,10 +434,11 @@ class CC_EXPORT LayerTreeHostImpl
   virtual void CreatePendingTree();
   virtual void ActivateSyncTree();
 
-  // Shortcuts to layers on the active tree.
+  // Shortcuts to layers/nodes on the active tree.
   LayerImpl* InnerViewportScrollLayer() const;
   LayerImpl* OuterViewportScrollLayer() const;
-  LayerImpl* CurrentlyScrollingLayer() const;
+  ScrollNode* CurrentlyScrollingNode();
+  const ScrollNode* CurrentlyScrollingNode() const;
 
   bool scroll_affects_scroll_handler() const {
     return scroll_affects_scroll_handler_;
@@ -649,7 +650,7 @@ class CC_EXPORT LayerTreeHostImpl
 
   InputHandler::ScrollStatus ScrollBeginImpl(
       ScrollState* scroll_state,
-      LayerImpl* scrolling_layer_impl,
+      ScrollNode* scrolling_node,
       InputHandler::ScrollInputType type);
   bool IsInitialScrollHitTestReliable(LayerImpl* layer, const gfx::PointF&);
   void DistributeScrollDelta(ScrollState* scroll_state);
@@ -668,7 +669,7 @@ class CC_EXPORT LayerTreeHostImpl
   // the frame should be drawn.
   DrawResult CalculateRenderPasses(FrameData* frame);
 
-  void ClearCurrentlyScrollingLayer();
+  void ClearCurrentlyScrollingNode();
 
   LayerImpl* FindScrollLayerForDeviceViewportPoint(
       const gfx::PointF& device_viewport_point,
@@ -766,7 +767,7 @@ class CC_EXPORT LayerTreeHostImpl
   gfx::Vector2dF accumulated_root_overscroll_;
 
   bool pinch_gesture_active_;
-  bool pinch_gesture_end_should_clear_scrolling_layer_;
+  bool pinch_gesture_end_should_clear_scrolling_node_;
 
   std::unique_ptr<BrowserControlsOffsetManager>
       browser_controls_offset_manager_;