Revert of Pinch/Zoom Infrastructure & Plumbing CL

webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc

Index: webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
index 484c946f207274d65746910f367d672b170738ef..265a97db41c55f70b9c424757b1f56624eba010c 100644
--- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
@@ -4,7 +4,6 @@
 
 #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"
@@ -52,16 +51,8 @@
 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