diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 20:54:10 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 20:54:10 +0000 |
| commit | 9d161d2d6f5976f1e6f8df8e23054c25572ee1a9 (patch) | |
| tree | be40743a1512e22b6eed346185b9ce7ca8a3b862 /cc/layers | |
| parent | ad0a4b06a57dc156fe3d4738d040719aaffd33d3 (diff) | |
| download | chromium_src-9d161d2d6f5976f1e6f8df8e23054c25572ee1a9.zip chromium_src-9d161d2d6f5976f1e6f8df8e23054c25572ee1a9.tar.gz chromium_src-9d161d2d6f5976f1e6f8df8e23054c25572ee1a9.tar.bz2 | |
cc: Include wheel/touch event handling in the JSON output for the layer tree.
This also adds a test with a small touch-handling region (TouchRegionLight), and
another test with a large number of touch-handling regions (TouchRegionHeavy)
for CalcDrawProps perf-test.
BUG=none
R=enne@chromium.org
Review URL: https://codereview.chromium.org/49913004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
| -rw-r--r-- | cc/layers/layer_impl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index ede4719..894daf1 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -614,6 +614,13 @@ base::DictionaryValue* LayerImpl::LayerTreeAsJson() const { if (scrollable_) result->SetBoolean("Scrollable", scrollable_); + if (have_wheel_event_handlers_) + result->SetBoolean("WheelHandler", have_wheel_event_handlers_); + if (!touch_event_handler_region_.IsEmpty()) { + scoped_ptr<base::Value> region = touch_event_handler_region_.AsValue(); + result->Set("TouchRegion", region.release()); + } + list = new base::ListValue; for (size_t i = 0; i < children_.size(); ++i) list->Append(children_[i]->LayerTreeAsJson()); |