Revert of Pinch/Zoom Infrastructure & Plumbing CL

webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc

 // Copyright 2012 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.
 
 #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
 
-#include "cc/layers/layer.h"
 #include "cc/layers/painted_scrollbar_layer.h"
 #include "cc/layers/scrollbar_layer_interface.h"
 #include "cc/layers/solid_color_scrollbar_layer.h"
 #include "webkit/renderer/compositor_bindings/scrollbar_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 using cc::PaintedScrollbarLayer;
 using cc::SolidColorScrollbarLayer;
 
 namespace {
@@ skipping 27 matching lines @@
               ConvertOrientation(orientation),
               thumb_thickness,
               is_left_side_vertical_scrollbar,
               0))) {}
 
 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {}
 
 blink::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); }
 
 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
-  cc::Layer* scroll_layer =
-      layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
-  layer_->layer()->ToScrollbarLayer()->SetScrollLayer(scroll_layer);
-}
-
-void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) {
-  cc::Layer* clip_layer =
-      layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
-  layer_->layer()->ToScrollbarLayer()
-      ->SetClipLayer(clip_layer);
+  int id = layer ? static_cast<WebLayerImpl*>(layer)->layer()->id() : 0;
+  static_cast<PaintedScrollbarLayer*>(layer_->layer())->SetScrollLayerId(id);
 }
 
 }  // namespace webkit