summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_json_parser.cc
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 /cc/test/layer_tree_json_parser.cc
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 'cc/test/layer_tree_json_parser.cc')
-rw-r--r--cc/test/layer_tree_json_parser.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index 1634868..6e3164c 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -126,6 +126,10 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
if (dict->GetBoolean("WheelHandler", &wheel_handler))
new_layer->SetHaveWheelEventHandlers(wheel_handler);
+ bool scroll_handler;
+ if (dict->GetBoolean("ScrollHandler", &scroll_handler))
+ new_layer->SetHaveScrollEventHandlers(scroll_handler);
+
if (dict->HasKey("TouchRegion")) {
success &= dict->GetList("TouchRegion", &list);
Region touch_region;