summaryrefslogtreecommitdiffstats
path: root/tools/perf/page_sets/image_decoding_measurement.py
diff options
context:
space:
mode:
authorchrishenry@google.com <chrishenry@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-08 07:00:57 +0000
committerchrishenry@google.com <chrishenry@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-08 07:00:57 +0000
commit64bb94fdffc91abd7ab5c2ba8a1054ff445f1467 (patch)
tree217cb492058f6448c50089488381a83232341391 /tools/perf/page_sets/image_decoding_measurement.py
parentcb81d40ce0799449a6001c38d14360d07712d8b3 (diff)
downloadchromium_src-64bb94fdffc91abd7ab5c2ba8a1054ff445f1467.zip
chromium_src-64bb94fdffc91abd7ab5c2ba8a1054ff445f1467.tar.gz
chromium_src-64bb94fdffc91abd7ab5c2ba8a1054ff445f1467.tar.bz2
Add Wait* API to ActionRunner to wrap over WaitAction.
Add ability to wait for an element specified by a JS function. The ActionRunner API's WaitForElement will not support lookup by xpath, unlike WaitAction(). Page sets that uses this feature now have their own _CreateXpathFunction instead, that uses element_function variant of WaitForElement. BUG=361809 Review URL: https://codereview.chromium.org/321563003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf/page_sets/image_decoding_measurement.py')
-rw-r--r--tools/perf/page_sets/image_decoding_measurement.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/perf/page_sets/image_decoding_measurement.py b/tools/perf/page_sets/image_decoding_measurement.py
index 7b8fe616..a0d1bca 100644
--- a/tools/perf/page_sets/image_decoding_measurement.py
+++ b/tools/perf/page_sets/image_decoding_measurement.py
@@ -17,10 +17,7 @@ class ImageDecodingMeasurementPage(page_module.Page):
def RunNavigateSteps(self, action_runner):
action_runner.NavigateToPage(self)
action_runner.ExecuteJavaScript('runBenchmark();')
- action_runner.RunAction(WaitAction(
- {
- 'javascript': 'isDone'
- }))
+ action_runner.WaitForJavaScriptCondition('isDone')
class ImageDecodingMeasurementPageSet(page_set_module.PageSet):