projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
cc
/
test
/
layer_tree_json_parser.cc
diff --git
a/src/cc/test/layer_tree_json_parser.cc
b/src/cc/test/layer_tree_json_parser.cc
index
1634868
..
6e3164c
100644
(file)
--- a/
src/cc/test/layer_tree_json_parser.cc
+++ b/
src/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);
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;
if (dict->HasKey("TouchRegion")) {
success &= dict->GetList("TouchRegion", &list);
Region touch_region;