Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / webkit / renderer / compositor_bindings / web_layer_impl.h

diff --git a/src/webkit/renderer/compositor_bindings/web_layer_impl.h b/src/webkit/renderer/compositor_bindings/web_layer_impl.h
index dbcca1e..4e46e30 100644 (file)
--- a/src/webkit/renderer/compositor_bindings/web_layer_impl.h
+++ b/src/webkit/renderer/compositor_bindings/web_layer_impl.h
@@ -25,9 +25,6 @@
 
 namespace cc { class Layer; }
 
-// TODO(senorblanco):  Remove this once WebKit changes have landed.
-class SkImageFilter;
-
 namespace blink {
 class WebFilterOperations;
 class WebLayerClient;
@@ -108,7 +105,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
   virtual void setForceRenderSurface(bool force);
   virtual void setScrollPosition(blink::WebPoint position);
   virtual blink::WebPoint scrollPosition() const;
-  virtual blink::WebSize maxScrollPosition() const;
   virtual void setScrollClipLayer(blink::WebLayer* clip_layer);
   virtual bool scrollable() const;
   virtual void setUserScrollable(bool horizontal, bool vertical);
@@ -116,6 +112,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
   virtual bool userScrollableVertical() const;
   virtual void setHaveWheelEventHandlers(bool have_wheel_event_handlers);
   virtual bool haveWheelEventHandlers() const;
+  virtual void setHaveScrollEventHandlers(bool have_scroll_event_handlers);
+  virtual bool haveScrollEventHandlers() const;
   virtual void setShouldScrollOnMainThread(bool scroll_on_main);
   virtual bool shouldScrollOnMainThread() const;
   virtual void setNonFastScrollableRegion(