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

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

Issue 186593007: Remove href_change and navigate from wait action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
« no previous file with comments | « tools/perf/page_sets/top_25.json ('k') | tools/telemetry/telemetry/page/actions/gesture_action_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « tools/perf/page_sets/top_25.json ('k') | tools/telemetry/telemetry/page/actions/gesture_action_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698