Pinch/Zoom Infrastructure & Plumbing CL

webkit/renderer/compositor_bindings/web_layer_impl.cc

Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
index 952af45d6eca767da0f4c8c6999cdfe4d0cd40cb..7927fc3473cb6277e93d76c8db1d56c7835d1918 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -230,19 +230,21 @@ void WebLayerImpl::setScrollPosition(WebKit::WebPoint position) {
 }
 
 WebKit::WebPoint WebLayerImpl::scrollPosition() const {
-  return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
+  return gfx::PointAtOffsetFromOrigin(layer_->TotalViewportScrollOffset());
 }
 
+// TODO(wjmaclean) Remove this function.
 void WebLayerImpl::setMaxScrollPosition(WebSize max_scroll_position) {
-  layer_->SetMaxScrollOffset(max_scroll_position);
 }
 
 WebSize WebLayerImpl::maxScrollPosition() const {
-  return layer_->max_scroll_offset();
+  return layer_->MaxScrollOffset();
 }
 
-void WebLayerImpl::setScrollable(bool scrollable) {
-  layer_->SetScrollable(scrollable);
+void WebLayerImpl::setScrollable(WebLayer* clip_layer) {
+  cc::Layer* cc_clip_layer =
+      clip_layer ? static_cast<WebLayerImpl*>(clip_layer)->layer() : 0;
+  layer_->SetScrollable(cc_clip_layer);
 }
 
 bool WebLayerImpl::scrollable() const { return layer_->scrollable(); }