| Index: trunk/src/tools/telemetry/telemetry/page/actions/scroll.py
|
| ===================================================================
|
| --- trunk/src/tools/telemetry/telemetry/page/actions/scroll.py (revision 236262)
|
| +++ trunk/src/tools/telemetry/telemetry/page/actions/scroll.py (working copy)
|
| @@ -21,8 +21,6 @@
|
| '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(
|
| @@ -48,32 +46,26 @@
|
| # }
|
| left_start_percentage = 0.5
|
| top_start_percentage = 0.5
|
| - gesture_source_type = 'chrome.gpuBenchmarking.DEFAULT_INPUT'
|
| 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,
|
| - gesture_source_type: %s })
|
| + top_start_percentage: %s })
|
| });""" % (self.scrollable_element_function,
|
| left_start_percentage,
|
| - top_start_percentage,
|
| - gesture_source_type))
|
| + top_start_percentage))
|
| else:
|
| tab.ExecuteJavaScript("""
|
| window.__scrollAction.start(
|
| { element: document.body,
|
| left_start_percentage: %s,
|
| - top_start_percentage: %s,
|
| - gesture_source_type: %s });"""
|
| - % (left_start_percentage, top_start_percentage, gesture_source_type))
|
| + top_start_percentage: %s });"""
|
| + % (left_start_percentage, top_start_percentage))
|
|
|
| tab.WaitForJavaScriptExpression('window.__scrollActionDone', 60)
|
|
|
|
|