Chromium Code Reviews| Index: tools/telemetry/telemetry/page/actions/scroll.py |
| diff --git a/tools/telemetry/telemetry/page/actions/scroll.py b/tools/telemetry/telemetry/page/actions/scroll.py |
| index f3106ec37a07805c6786aa6c2794b404bfb76568..26cddf7de26b4db3c262a90db24b30240d23d50c 100644 |
| --- a/tools/telemetry/telemetry/page/actions/scroll.py |
| +++ b/tools/telemetry/telemetry/page/actions/scroll.py |
| @@ -21,6 +21,8 @@ class ScrollAction(page_action.PageAction): |
| 'Synthetic scroll not supported for this browser') |
| # Fail if this action requires touch and we can't send touch events. |
| + # TODO(dominikg): Query synthetic gesture target to check if touch is |
| + # supported. |
| if (hasattr(self, 'scroll_requires_touch') and |
| self.scroll_requires_touch and not |
| tab.EvaluateJavaScript( |
| @@ -46,26 +48,32 @@ class ScrollAction(page_action.PageAction): |
| # } |
| left_start_percentage = 0.5 |
| top_start_percentage = 0.5 |
| + gesture_source_type = 'chrome.gpuBenchmarking.DEFAULT_INPUT' |
|
bulach
2013/11/20 12:06:17
as above, this needs to be guarded..
easy way to c
|
| if hasattr(self, 'left_start_percentage'): |
| left_start_percentage = self.left_start_percentage |
| if hasattr(self, 'top_start_percentage'): |
| top_start_percentage = self.top_start_percentage |
| + if hasattr(self, 'scroll_requires_touch') and self.scroll_requires_touch: |
| + gesture_source_type = 'chrome.gpuBenchmarking.TOUCH_INPUT' |
| if hasattr(self, 'scrollable_element_function'): |
| tab.ExecuteJavaScript(""" |
| (%s)(function(element) { window.__scrollAction.start( |
| { element: element, |
| left_start_percentage: %s, |
| - top_start_percentage: %s }) |
| + top_start_percentage: %s, |
| + gesture_source_type: %s }) |
| });""" % (self.scrollable_element_function, |
| left_start_percentage, |
| - top_start_percentage)) |
| + top_start_percentage, |
| + gesture_source_type)) |
| else: |
| tab.ExecuteJavaScript(""" |
| window.__scrollAction.start( |
| { element: document.body, |
| left_start_percentage: %s, |
| - top_start_percentage: %s });""" |
| - % (left_start_percentage, top_start_percentage)) |
| + top_start_percentage: %s, |
| + gesture_source_type: %s });""" |
| + % (left_start_percentage, top_start_percentage, gesture_source_type)) |
| tab.WaitForJavaScriptExpression('window.__scrollActionDone', 60) |