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 950f76e93a3e441b73ec5637a8c943ea2cdc44ab..c896c05cb8e36b2cf4cb91a27882c81f0c0329b6 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -224,19 +224,17 @@ void WebLayerImpl::setScrollPosition(blink::WebPoint position) {
 }
 
 blink::WebPoint WebLayerImpl::scrollPosition() const {
-  return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
-}
-
-void WebLayerImpl::setMaxScrollPosition(WebSize max_scroll_position) {
-  layer_->SetMaxScrollOffset(max_scroll_position);
+  return gfx::PointAtOffsetFromOrigin(layer_->TotalViewportScrollOffset());
 }
 
 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(); }