Revert of Fix scroll chaining for non-descendants of root scroller.

cc/layers/layer_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_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 84 matching lines @@
   gfx::ScrollOffset ScrollOffsetForAnimation() const;
   void OnTransformIsCurrentlyAnimatingChanged(bool is_currently_animating);
   void OnTransformIsPotentiallyAnimatingChanged(bool has_potential_animation);
   void OnOpacityIsCurrentlyAnimatingChanged(bool is_currently_animating);
   void OnOpacityIsPotentiallyAnimatingChanged(bool has_potential_animation);
   void OnFilterIsCurrentlyAnimatingChanged(bool is_currently_animating);
   void OnFilterIsPotentiallyAnimatingChanged(bool has_potential_animation);
   bool IsActive() const;
 
   void DistributeScroll(ScrollState* scroll_state);
+  void ApplyScroll(ScrollState* scroll_state);
 
   void set_property_tree_sequence_number(int sequence_number) {}
 
   void SetTransformTreeIndex(int index);
   int transform_tree_index() const { return transform_tree_index_; }
 
   void SetClipTreeIndex(int index);
   int clip_tree_index() const { return clip_tree_index_; }
 
   void SetEffectTreeIndex(int index);
@@ skipping 460 matching lines @@
   bool scrolls_drawn_descendant_ : 1;
   bool has_will_change_transform_hint_ : 1;
   bool needs_push_properties_ : 1;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_