Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Unified Diff: tools/telemetry/telemetry/page/actions/pinch.py

Issue 134243004: Telemetry: allow user to specify source type for synthetic gestures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-upload Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/page/actions/pinch.py
diff --git a/tools/telemetry/telemetry/page/actions/pinch.py b/tools/telemetry/telemetry/page/actions/pinch.py
index ff2e471b48a93c66c14347879dcfc76eb31ffe69..a685bbb419dc62003c55b2b5e38036bff9700a22 100644
--- a/tools/telemetry/telemetry/page/actions/pinch.py
+++ b/tools/telemetry/telemetry/page/actions/pinch.py
@@ -3,10 +3,10 @@
# found in the LICENSE file.
import os
-from telemetry.page.actions import gesture_action
+from telemetry.page.actions.gesture_action import GestureAction
from telemetry.page.actions import page_action
-class PinchAction(gesture_action.GestureAction):
+class PinchAction(GestureAction):
def __init__(self, attributes=None):
super(PinchAction, self).__init__(attributes)
self._SetTimelineMarkerBaseName('PinchAction::RunAction')
@@ -22,6 +22,11 @@ class PinchAction(gesture_action.GestureAction):
raise page_action.PageActionNotSupported(
'Synthetic pinch not supported for this browser')
+ if (GestureAction.GetGestureSourceTypeFromOptions(tab) ==
+ 'chrome.gpuBenchmarking.MOUSE_INPUT'):
+ raise page_action.PageActionNotSupported(
+ 'Pinch page action does not support mouse input')
+
done_callback = 'function() { window.__pinchActionDone = true; }'
tab.ExecuteJavaScript("""
window.__pinchActionDone = false;
« no previous file with comments | « tools/telemetry/telemetry/page/actions/gesture_action.py ('k') | tools/telemetry/telemetry/page/actions/scroll.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698