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 8dd66e2d660e157aa032f924811dafa5df34637a..7c1248032300ebd869fc48f1faf8258c92a668b6 100644 |
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc |
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc |
@@ -14,7 +14,6 @@ |
#include "cc/base/switches.h" |
#include "cc/layers/layer.h" |
#include "cc/layers/layer_position_constraint.h" |
-#include "cc/trees/layer_tree_host.h" |
#include "third_party/WebKit/public/platform/WebFloatPoint.h" |
#include "third_party/WebKit/public/platform/WebFloatRect.h" |
#include "third_party/WebKit/public/platform/WebGraphicsLayerDebugInfo.h" |
@@ -261,14 +260,16 @@ |
return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset()); |
} |
+void WebLayerImpl::setMaxScrollPosition(WebSize max_scroll_position) { |
+ layer_->SetMaxScrollOffset(max_scroll_position); |
+} |
+ |
WebSize WebLayerImpl::maxScrollPosition() const { |
- return layer_->MaxScrollOffset(); |
-} |
- |
-void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) { |
- cc::Layer* cc_clip_layer = |
- clip_layer ? static_cast<WebLayerImpl*>(clip_layer)->layer() : 0; |
- layer_->SetScrollClipLayer(cc_clip_layer); |
+ return layer_->max_scroll_offset(); |
+} |
+ |
+void WebLayerImpl::setScrollable(bool scrollable) { |
+ layer_->SetScrollable(scrollable); |
} |
bool WebLayerImpl::scrollable() const { return layer_->scrollable(); } |