summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 12:14:10 +0000
committerphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 12:14:10 +0000
commit0c2ebef56c7d9b32a4df60fac57469e60b0c43c7 (patch)
tree4c973e94cc43a3323046b7851a6317ebbf3c54f8 /tools
parentfa35f58cc80cd0ab820101362357516145e4c142 (diff)
downloadchromium_src-0c2ebef56c7d9b32a4df60fac57469e60b0c43c7.zip
chromium_src-0c2ebef56c7d9b32a4df60fac57469e60b0c43c7.tar.gz
chromium_src-0c2ebef56c7d9b32a4df60fac57469e60b0c43c7.tar.bz2
Revert 192041 "Splits SmoothGestureController from RenderWidgetH..."
> Splits SmoothGestureController from RenderWidgetHostImpl > > Elements were pushed when the platform sends an input event, > but they're are popped when the event are ACKd. > There are other internal queues such as "touch_event_queue_" and > "gesture_filter_" that may coalesce / ACK events using their own internal > order. > This results in in_process_event_types_ not being popped correctly, and > prevents Telemetry from synthesizing Motion events on android. > The solution is to move the synthetic events out of RenderWidgetHostImpl and use a simple counter there. > > BUG=166521 > TEST=content_unittest, SmoothScrollGestureControllerTest > > Review URL: https://chromiumcodereview.appspot.com/11858007 TBR=bulach@chromium.org Review URL: https://codereview.chromium.org/13408009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/telemetry/telemetry/page/actions/scroll.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/telemetry/telemetry/page/actions/scroll.js b/tools/telemetry/telemetry/page/actions/scroll.js
index 32952cc..2ccfece 100644
--- a/tools/telemetry/telemetry/page/actions/scroll.js
+++ b/tools/telemetry/telemetry/page/actions/scroll.js
@@ -73,13 +73,9 @@
chrome.gpuBenchmarking &&
chrome.gpuBenchmarking.smoothScrollBy) {
var rect = getBoundingVisibleRect(this.element_);
- var scrolled = chrome.gpuBenchmarking.smoothScrollBy(
- distance, function() {
- callback();
- },
- rect.left + rect.width / 2, rect.top + rect.height / 2);
- if (!scrolled)
- console.log('Unable to start smooth scrolling');
+ chrome.gpuBenchmarking.smoothScrollBy(distance, function() {
+ callback();
+ }, rect.left + rect.width / 2, rect.top + rect.height / 2);
return;
}