diff options
| author | ulan <ulan@chromium.org> | 2015-12-03 13:14:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-03 21:15:37 +0000 |
| commit | f61a745f7c4fbc155a3e437d913acd9fe55953f3 (patch) | |
| tree | 3ea70a6c52a6b6bb512d18e826ca195be141055e /tools | |
| parent | dcfa6369e18123e7bc8b99b4cd213144f5019980 (diff) | |
| download | chromium_src-f61a745f7c4fbc155a3e437d913acd9fe55953f3.zip chromium_src-f61a745f7c4fbc155a3e437d913acd9fe55953f3.tar.gz chromium_src-f61a745f7c4fbc155a3e437d913acd9fe55953f3.tar.bz2 | |
Pass timeout to RepeatableScrollAction.
This will allow benchmarks to make longer scroll actions.
BUG=565306
Review URL: https://codereview.chromium.org/1492363002
Cr-Commit-Position: refs/heads/master@{#363060}
Diffstat (limited to 'tools')
3 files changed, 11 insertions, 6 deletions
diff --git a/tools/telemetry/telemetry/internal/actions/repeatable_scroll.py b/tools/telemetry/telemetry/internal/actions/repeatable_scroll.py index ef33399..79ba4c4 100644 --- a/tools/telemetry/telemetry/internal/actions/repeatable_scroll.py +++ b/tools/telemetry/telemetry/internal/actions/repeatable_scroll.py @@ -9,13 +9,14 @@ from telemetry.web_perf import timeline_interaction_record class RepeatableScrollAction(page_action.PageAction): def __init__(self, x_scroll_distance_ratio=0.0, y_scroll_distance_ratio=0.5, - repeat_count=0, repeat_delay_ms=250): + repeat_count=0, repeat_delay_ms=250, timeout=60): super(RepeatableScrollAction, self).__init__() self._x_scroll_distance_ratio = x_scroll_distance_ratio self._y_scroll_distance_ratio = y_scroll_distance_ratio self._repeat_count = repeat_count self._repeat_delay_ms = repeat_delay_ms self._windowsize = [] + self._timeout = timeout def WillRunAction(self, tab): # Get the dimensions of the screen. @@ -35,4 +36,5 @@ class RepeatableScrollAction(page_action.PageAction): repeatCount=self._repeat_count, repeatDelayMs=self._repeat_delay_ms, interactionMarkerName=timeline_interaction_record.GetJavaScriptMarker( - 'Gesture_ScrollAction', [timeline_interaction_record.REPEATABLE])) + 'Gesture_ScrollAction', [timeline_interaction_record.REPEATABLE]), + timeout=self._timeout) diff --git a/tools/telemetry/telemetry/internal/browser/web_contents.py b/tools/telemetry/telemetry/internal/browser/web_contents.py index 25f1980..d360f1d 100644 --- a/tools/telemetry/telemetry/internal/browser/web_contents.py +++ b/tools/telemetry/telemetry/internal/browser/web_contents.py @@ -300,7 +300,8 @@ class WebContents(object): xOverscroll=None, yOverscroll=None, preventFling=True, speed=None, gestureSourceType=None, repeatCount=None, - repeatDelayMs=None, interactionMarkerName=None): + repeatDelayMs=None, interactionMarkerName=None, + timeout=60): """Runs an inspector command that causes a repeatable browser driven scroll. Args: @@ -327,4 +328,5 @@ class WebContents(object): preventFling=preventFling, speed=speed, gestureSourceType=gestureSourceType, repeatCount=repeatCount, repeatDelayMs=repeatDelayMs, - interactionMarkerName=interactionMarkerName) + interactionMarkerName=interactionMarkerName, + timeout=timeout) diff --git a/tools/telemetry/telemetry/page/action_runner.py b/tools/telemetry/telemetry/page/action_runner.py index 805e62d..d36a6c1 100644 --- a/tools/telemetry/telemetry/page/action_runner.py +++ b/tools/telemetry/telemetry/page/action_runner.py @@ -362,7 +362,8 @@ class ActionRunner(object): def RepeatableBrowserDrivenScroll(self, x_scroll_distance_ratio=0.0, y_scroll_distance_ratio=0.5, repeat_count=0, - repeat_delay_ms=250): + repeat_delay_ms=250, + timeout=60): """Perform a browser driven repeatable scroll gesture. The scroll gesture is driven from the browser, this is useful because the @@ -381,7 +382,7 @@ class ActionRunner(object): x_scroll_distance_ratio=x_scroll_distance_ratio, y_scroll_distance_ratio=y_scroll_distance_ratio, repeat_count=repeat_count, - repeat_delay_ms=repeat_delay_ms)) + repeat_delay_ms=repeat_delay_ms, timeout=timeout)) def ScrollElement(self, selector=None, text=None, element_function=None, left_start_ratio=0.5, top_start_ratio=0.5, |