Index: content/test/gpu/page_sets/pixel_tests.py |
diff --git a/content/test/gpu/page_sets/pixel_tests.py b/content/test/gpu/page_sets/pixel_tests.py |
index deb75faa2dd907a1b66c2a59cf20d49402504dcb..08cc2b32e01d2cb738220b800af87af19d31004a 100644 |
--- a/content/test/gpu/page_sets/pixel_tests.py |
+++ b/content/test/gpu/page_sets/pixel_tests.py |
@@ -48,6 +48,15 @@ class IOSurface2DCanvasSharedPageState(gpu_test_base.GpuSharedPageState): |
['--enable-accelerated-2d-canvas', |
'--disable-display-list-2d-canvas']) |
+class SoftwareOffscreenCanvas2DSharedPageState( |
+ gpu_test_base.GpuSharedPageState): |
+ def __init__(self, test, finder_options, story_set): |
+ super(SoftwareOffscreenCanvas2DSharedPageState, self).__init__( |
+ test, finder_options, story_set) |
+ finder_options.browser_options.AppendExtraBrowserArgs( |
+ ['--disable-accelerated-2d-canvas', |
+ '--disable-gpu-compositing', |
+ '--enable-experimental-canvas-features']) |
class WebGLNonChromiumImageSharedPageState(gpu_test_base.GpuSharedPageState): |
def __init__(self, test, finder_options, story_set): |
@@ -135,6 +144,16 @@ class PixelTestsStorySet(story_set_module.StorySet): |
shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState, |
expectations=expectations)) |
+ # Pages requiring the use of --enable-experimental-canvas-features and |
+ # --disable-accelerated-2d-canvas. |
+ self.AddStory(PixelTestsPage( |
Ken Russell (switch to Gerrit)
2016/09/29 22:47:28
This new page should now be added to src/content/t
|
+ url='file://../../data/gpu/pixel_acceleratedOffscreen2d_commit_main.html', |
+ name=base_name + '.OffscreenCanvasUnaccelerated2D', |
+ test_rect=[0, 0, 350, 350], |
+ revision=1, |
+ story_set=self, |
+ shared_page_state_class=SoftwareOffscreenCanvas2DSharedPageState, |
+ expectations=expectations)) |
# Would be better to fetch this from Telemetry. |
# TODO(kbr): enable this on all platforms. Don't know what will |