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',

[danakj, 2016/09/23 20:40:01]

Which this verifies software compositing when it's blacklisted, we also fall
into software compositing when the gpu process fails to make a context 3 times
(see RenderWidgetCompositor for this). In that case you can't rely on canvas
being disabled by runtime flags and stuff. So while this makes sense for the
pixel test, the code needs to handle more cases and you probably want to unit
test that.

+       '--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 143 matching lines @@
     self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_acceleratedOffscreen2d_commit_worker.html',
       name=base_name + '.OffscreenCanvasAccelerated2DWorker' + es3_suffix,
       test_rect=[0, 0, 350, 350],
       revision=1,
       story_set=self,
       shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
       expectations=expectations))
 
     self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_acceleratedOffscreen2d_commit_main.html',
+      name=base_name + '.OffscreenCanvasUnaccelerated2D' + es3_suffix,
+      test_rect=[0, 0, 350, 350],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=SoftwareOffscreenCanvas2DSharedPageState,
+      expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_canvas2d.html',
       name=base_name + '.Canvas2DRedBox' + es3_suffix,
       test_rect=[0, 0, 300, 300],
       revision=7,
       story_set=self,
       shared_page_state_class=shared_page_state_class,
       expectations=expectations))
 
     self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_css3d.html',
@@ skipping 67 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