Revert 197178 "Make it possible to delegate root layer scroll of..."

> Make it possible to delegate root layer scroll offset outside of cc.
> 
> This change makes it possible for the embedder to own the root layer
> scroll offset.
> 
> BUG=b/6029133
> 
> Review URL: https://chromiumcodereview.appspot.com/13869006

Fixes TreeCloser Bug 236675
TBR=mkosiba@chromium.org

Review URL: https://codereview.chromium.org/14564002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197189 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 21 deletions

diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 84cc96a..4b44a15 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -25,9 +25,8 @@ LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl)
     : layer_tree_host_impl_(layer_tree_host_impl),
       source_frame_number_(-1),
       hud_layer_(0),
-      root_scroll_layer_(NULL),
-      currently_scrolling_layer_(NULL),
-      root_layer_scroll_offset_delegate_(NULL),
+      root_scroll_layer_(0),
+      currently_scrolling_layer_(0),
       background_color_(0),
       has_transparent_background_(false),
       pinch_zoom_scrollbar_horizontal_layer_id_(Layer::INVALID_ID),
@@ -68,8 +67,6 @@ static LayerImpl* FindRootScrollLayerRecursive(LayerImpl* layer) {
 
 void LayerTreeImpl::SetRootLayer(scoped_ptr<LayerImpl> layer) {
   root_layer_ = layer.Pass();
-  if (root_scroll_layer_)
-    root_scroll_layer_->SetScrollOffsetDelegate(NULL);
   root_scroll_layer_ = NULL;
   currently_scrolling_layer_ = NULL;
 
@@ -79,11 +76,6 @@ void LayerTreeImpl::SetRootLayer(scoped_ptr<LayerImpl> layer) {
 void LayerTreeImpl::FindRootScrollLayer() {
   root_scroll_layer_ = FindRootScrollLayerRecursive(root_layer_.get());
 
-  if (root_scroll_layer_) {
-    root_scroll_layer_->SetScrollOffsetDelegate(
-        root_layer_scroll_offset_delegate_);
-  }
-
   if (root_layer_ && scrolling_layer_id_from_previous_tree_) {
     currently_scrolling_layer_ = LayerTreeHostCommon::FindLayerInSubtree(
         root_layer_.get(),
@@ -97,8 +89,6 @@ scoped_ptr<LayerImpl> LayerTreeImpl::DetachLayerTree() {
   // Clear all data structures that have direct references to the layer tree.
   scrolling_layer_id_from_previous_tree_ =
     currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0;
-  if (root_scroll_layer_)
-    root_scroll_layer_->SetScrollOffsetDelegate(NULL);
   root_scroll_layer_ = NULL;
   currently_scrolling_layer_ = NULL;
 
@@ -571,15 +561,6 @@ void LayerTreeImpl::DidEndScroll() {
     FadeOutPinchZoomScrollbars();
 }
 
-void LayerTreeImpl::SetRootLayerScrollOffsetDelegate(
-      LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) {
-  root_layer_scroll_offset_delegate_ = root_layer_scroll_offset_delegate;
-  if (root_scroll_layer_) {
-    root_scroll_layer_->SetScrollOffsetDelegate(
-        root_layer_scroll_offset_delegate_);
-  }
-}
-
 void LayerTreeImpl::SetPinchZoomHorizontalLayerId(int layer_id) {
   pinch_zoom_scrollbar_horizontal_layer_id_ = layer_id;
 }