summaryrefslogtreecommitdiffstats
path: root/content/test/gpu
diff options
context:
space:
mode:
authornednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 08:26:13 +0000
committernednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 08:26:13 +0000
commitb905a077482c56d6ee594e87fb8a932d38aa42c1 (patch)
treebdf70197d0c6aa91191b0862a480808a15cad652 /content/test/gpu
parent86caa386aa981c0e3f0360a6a6b398c74bd1a979 (diff)
downloadchromium_src-b905a077482c56d6ee594e87fb8a932d38aa42c1.zip
chromium_src-b905a077482c56d6ee594e87fb8a932d38aa42c1.tar.gz
chromium_src-b905a077482c56d6ee594e87fb8a932d38aa42c1.tar.bz2
Add NavigateToPage API for action_runner.
Remove page parameter from PageAction.RunAction(). BUG=361809 Review URL: https://codereview.chromium.org/277143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/gpu')
-rw-r--r--content/test/gpu/gpu_tests/context_lost.py6
-rw-r--r--content/test/gpu/gpu_tests/maps.py2
-rw-r--r--content/test/gpu/gpu_tests/screenshot_sync.py2
-rw-r--r--content/test/gpu/gpu_tests/webgl_conformance.py2
-rw-r--r--content/test/gpu/gpu_tests/webgl_robustness.py2
-rw-r--r--content/test/gpu/page_sets/gpu_process_tests.py4
-rw-r--r--content/test/gpu/page_sets/gpu_rasterization_tests.py2
-rw-r--r--content/test/gpu/page_sets/memory_tests.py2
-rw-r--r--content/test/gpu/page_sets/pixel_tests.py2
9 files changed, 12 insertions, 12 deletions
diff --git a/content/test/gpu/gpu_tests/context_lost.py b/content/test/gpu/gpu_tests/context_lost.py
index 3e5840d..5a05d83 100644
--- a/content/test/gpu/gpu_tests/context_lost.py
+++ b/content/test/gpu/gpu_tests/context_lost.py
@@ -137,7 +137,7 @@ class WebGLContextLostFromGPUProcessExitPage(page.Page):
self.force_garbage_collection = False
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{'javascript': 'window.domAutomationController._loaded'}))
@@ -154,7 +154,7 @@ class WebGLContextLostFromLoseContextExtensionPage(page.Page):
self.force_garbage_collection = False
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{'javascript': 'window.domAutomationController._finished'}))
@@ -170,7 +170,7 @@ class WebGLContextLostFromQuantityPage(page.Page):
self.force_garbage_collection = True
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{'javascript': 'window.domAutomationController._loaded'}))
diff --git a/content/test/gpu/gpu_tests/maps.py b/content/test/gpu/gpu_tests/maps.py
index bb431fb..aeafe4f 100644
--- a/content/test/gpu/gpu_tests/maps.py
+++ b/content/test/gpu/gpu_tests/maps.py
@@ -83,7 +83,7 @@ class MapsPage(page.Page):
self.pixel_expectations = 'data/maps_002_expectations.json'
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction({'javascript': 'window.testDone'}))
diff --git a/content/test/gpu/gpu_tests/screenshot_sync.py b/content/test/gpu/gpu_tests/screenshot_sync.py
index 03ca595..a2d8abb 100644
--- a/content/test/gpu/gpu_tests/screenshot_sync.py
+++ b/content/test/gpu/gpu_tests/screenshot_sync.py
@@ -37,7 +37,7 @@ class ScreenshotSyncPage(page.Page):
self.user_agent_type = 'desktop'
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction({
'javascript': 'window.__testComplete',
'timeout': 120}))
diff --git a/content/test/gpu/gpu_tests/webgl_conformance.py b/content/test/gpu/gpu_tests/webgl_conformance.py
index 2aa8ab4..965ea9f 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance.py
@@ -88,7 +88,7 @@ class WebglConformancePage(page_module.Page):
self.script_to_evaluate_on_commit = conformance_harness_script
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{'javascript': 'webglTestHarness._finished', 'timeout': 120}))
diff --git a/content/test/gpu/gpu_tests/webgl_robustness.py b/content/test/gpu/gpu_tests/webgl_robustness.py
index a68467c2..497cacb 100644
--- a/content/test/gpu/gpu_tests/webgl_robustness.py
+++ b/content/test/gpu/gpu_tests/webgl_robustness.py
@@ -57,7 +57,7 @@ class WebglRobustnessPage(page.Page):
self.script_to_evaluate_on_commit = robustness_harness_script
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(
WaitAction({'javascript': 'webglTestHarness._finished'}))
diff --git a/content/test/gpu/page_sets/gpu_process_tests.py b/content/test/gpu/page_sets/gpu_process_tests.py
index 0089743..c9abeb0 100644
--- a/content/test/gpu/page_sets/gpu_process_tests.py
+++ b/content/test/gpu/page_sets/gpu_process_tests.py
@@ -15,7 +15,7 @@ class GpuProcessTestsPage(page_module.Page):
self.user_agent_type = 'desktop'
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
class FunctionalVideoPage(GpuProcessTestsPage):
@@ -26,7 +26,7 @@ class FunctionalVideoPage(GpuProcessTestsPage):
page_set=page_set)
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{
'javascript': 'domAutomationController._finished',
diff --git a/content/test/gpu/page_sets/gpu_rasterization_tests.py b/content/test/gpu/page_sets/gpu_rasterization_tests.py
index c908a88..6c23e6c 100644
--- a/content/test/gpu/page_sets/gpu_rasterization_tests.py
+++ b/content/test/gpu/page_sets/gpu_rasterization_tests.py
@@ -69,7 +69,7 @@ class GpuRasterizationTestsPage(page_module.Page):
self.test_rect = [0, 0, 250, 250]
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{
'javascript': 'domAutomationController._finished',
diff --git a/content/test/gpu/page_sets/memory_tests.py b/content/test/gpu/page_sets/memory_tests.py
index 2492d22..dee9c15 100644
--- a/content/test/gpu/page_sets/memory_tests.py
+++ b/content/test/gpu/page_sets/memory_tests.py
@@ -16,7 +16,7 @@ class MemoryTestsPage(page_module.Page):
self.user_agent_type = 'desktop'
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{
'javascript': 'domAutomationController._finished',
diff --git a/content/test/gpu/page_sets/pixel_tests.py b/content/test/gpu/page_sets/pixel_tests.py
index 254e047..3128ba2 100644
--- a/content/test/gpu/page_sets/pixel_tests.py
+++ b/content/test/gpu/page_sets/pixel_tests.py
@@ -16,7 +16,7 @@ class PixelTestsPage(page_module.Page):
self.revision = revision
def RunNavigateSteps(self, action_runner):
- action_runner.RunAction(NavigateAction())
+ action_runner.NavigateToPage(self)
action_runner.RunAction(WaitAction(
{
'javascript': 'domAutomationController._finished',