Implement OffscreenCanvas Unaccelerated 2d commit() on main thread

content/test/gpu/page_sets/pixel_tests.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from telemetry.story import story_set as story_set_module
 
 import sys
 
 from gpu_tests import gpu_test_base
 
@@ skipping 30 matching lines @@
 
 
 class IOSurface2DCanvasSharedPageState(gpu_test_base.GpuSharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(IOSurface2DCanvasSharedPageState, self).__init__(
       test, finder_options, story_set)
     finder_options.browser_options.AppendExtraBrowserArgs(
       ['--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):
     super(WebGLNonChromiumImageSharedPageState, self).__init__(
       test, finder_options, story_set)
     finder_options.browser_options.AppendExtraBrowserArgs(
       ['--disable-webgl-image-chromium'])
 
 
 class DisableMacOverlaysSharedPageState(gpu_test_base.GpuSharedPageState):
@@ skipping 67 matching lines @@
 
     self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_acceleratedOffscreen2d_commit_worker.html',
       name=base_name + '.OffscreenCanvasAccelerated2DWorker',
       test_rect=[0, 0, 350, 350],
       revision=1,
       story_set=self,
       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/test/gpu/gpu_tests/pixel_test_pages.py instead, now that
https://codereview.chromium.org/2363343002/ has landed. Please let me know if
you have any questions about the new format. You no longer need to specify a
shared page state, just the browser command line arguments you want per-page.

+      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
     # happen on Android right now.
     if try_es3 and sys.platform.startswith('darwin'):
       # Add all the tests again, this time with the
       # --enable-unsafe-es3-apis command line argument. This has the
       # side-effect of enabling the Core Profile rendering path on Mac
       # OS.
       self._AddAllPages(expectations, base_name, True)
@@ skipping 164 matching lines @@
       story_set=self,
       shared_page_state_class=shared_page_state_class,
       expectations=expectations))
 
   @property
   def allow_mixed_story_states(self):
     # Return True here in order to be able to add the same tests with
     # a different SharedPageState on Mac which tests them with the
     # Core Profile rendering path.
     return True