| Index: tools/telemetry/telemetry/page/actions/gesture_action.py
|
| diff --git a/tools/telemetry/telemetry/page/actions/gesture_action.py b/tools/telemetry/telemetry/page/actions/gesture_action.py
|
| index 40f52ad970ad7ec1b40416d4f9fda4c8b4734d98..f1247a4ed75ac341f74742da71b013e6581e0474 100644
|
| --- a/tools/telemetry/telemetry/page/actions/gesture_action.py
|
| +++ b/tools/telemetry/telemetry/page/actions/gesture_action.py
|
| @@ -9,25 +9,28 @@ from telemetry.page.actions import wait
|
| class GestureAction(page_action.PageAction):
|
| def __init__(self, attributes=None):
|
| super(GestureAction, self).__init__(attributes)
|
| -
|
| if hasattr(self, 'wait_after'):
|
| self.wait_action = wait.WaitAction(self.wait_after)
|
| else:
|
| self.wait_action = None
|
|
|
| - def RunAction(self, page, tab, previous_action):
|
| + assert self.wait_until is None or self.wait_action is None, '''gesture
|
| +cannot have wait_after and wait_until at the same time.'''
|
| +
|
| +
|
| + def RunAction(self, page, tab):
|
| tab.ExecuteJavaScript(
|
| 'console.time("' + self._GetUniqueTimelineMarkerName() + '")')
|
|
|
| - self.RunGesture(page, tab, previous_action)
|
| + self.RunGesture(page, tab)
|
|
|
| tab.ExecuteJavaScript(
|
| 'console.timeEnd("' + self._GetUniqueTimelineMarkerName() + '")')
|
|
|
| if self.wait_action:
|
| - self.wait_action.RunAction(page, tab, previous_action)
|
| + self.wait_action.RunAction(page, tab)
|
|
|
| - def RunGesture(self, page, tab, previous_action):
|
| + def RunGesture(self, page, tab):
|
| raise NotImplementedError()
|
|
|
| @staticmethod
|
|
|