summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorskyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 20:02:51 +0000
committerskyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 20:02:51 +0000
commitf998c534d46164ee99d675ead70b08f83402ebfa (patch)
treedb1d9a1a5e547fe0d378959a5bfa98d8b677d029 /webkit
parent15857f9e30111a73acea8d0ba156ec5da2a5f4ff (diff)
downloadchromium_src-f998c534d46164ee99d675ead70b08f83402ebfa.zip
chromium_src-f998c534d46164ee99d675ead70b08f83402ebfa.tar.gz
chromium_src-f998c534d46164ee99d675ead70b08f83402ebfa.tar.bz2
cc: Add layer property for scroll handlers
Add a layer property that tells whether the layer has registered scroll handlers. This is similar to the existing property for wheel handlers. This patch only adds the new property and doesn't hook it up to anything substantial yet. BUG=347366 Review URL: https://codereview.chromium.org/207313005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/renderer/compositor_bindings/web_layer_impl.cc8
-rw-r--r--webkit/renderer/compositor_bindings/web_layer_impl.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
index a0caaf5..86c398f 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -287,6 +287,14 @@ bool WebLayerImpl::haveWheelEventHandlers() const {
return layer_->have_wheel_event_handlers();
}
+void WebLayerImpl::setHaveScrollEventHandlers(bool have_scroll_event_handlers) {
+ layer_->SetHaveScrollEventHandlers(have_scroll_event_handlers);
+}
+
+bool WebLayerImpl::haveScrollEventHandlers() const {
+ return layer_->have_scroll_event_handlers();
+}
+
void WebLayerImpl::setShouldScrollOnMainThread(
bool should_scroll_on_main_thread) {
layer_->SetShouldScrollOnMainThread(should_scroll_on_main_thread);
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.h b/webkit/renderer/compositor_bindings/web_layer_impl.h
index dbcca1e..391115c 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.h
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.h
@@ -116,6 +116,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(