Fix failing transferToImageBitmap layout tests and commit pixel test on Mac

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 61 matching lines @@
       test, finder_options, story_set)
     finder_options.browser_options.AppendExtraBrowserArgs(
       ['--enable-experimental-canvas-features'])
 
 class PixelTestsStorySet(story_set_module.StorySet):
 
   """ Some basic test cases for GPU. """
   def __init__(self, expectations, base_name='Pixel', try_es3=False):
     super(PixelTestsStorySet, self).__init__()
     self._AddAllPages(expectations, base_name, False)
+
+    # Pages requiring the use of --enable-experimental-canvas-features
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_offscreenCanvas_transferToImageBitmap_main.html',
+      name=base_name + '.OffscreenCanvasTransferToImageBitmap',
+      test_rect=[0, 0, 300, 300],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
+      expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_offscreenCanvas_transferToImageBitmap_worker.html',
+      name=base_name + '.OffscreenCanvasTransferToImageBitmapWorker',
+      test_rect=[0, 0, 300, 300],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
+      expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_offscreenCanvas_webgl_commit_main.html',
+      name=base_name + '.OffscreenCanvasWebGLGreenBox',
+      test_rect=[0, 0, 300, 300],
+      revision=2,
+      story_set=self,
+      shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
+      expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_offscreenCanvas_webgl_commit_worker.html',
+      name=base_name + '.OffscreenCanvasWebGLRedBoxWorker',
+      test_rect=[0, 0, 300, 300],
+      revision=3,
+      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 + '.OffscreenCanvasAccelerated2D',
+      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_worker.html',
+      name=base_name + '.OffscreenCanvasAccelerated2DWorker',
+      test_rect=[0, 0, 350, 350],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
+      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 76 matching lines @@
 
   def _AddAllPages(self, expectations, base_name, use_es3):
     if use_es3:
       es3_suffix = 'ES3'
       shared_page_state_class = PixelTestsES3SharedPageState
     else:
       es3_suffix = ''
       shared_page_state_class = gpu_test_base.GpuSharedPageState
 
     self.AddStory(PixelTestsPage(
-      url='file://../../data/gpu/pixel_offscreenCanvas_webgl_commit_main.html',
-      name=base_name + '.OffscreenCanvasWebGLGreenBox' + es3_suffix,
-      test_rect=[0, 0, 300, 300],
-      revision=1,
-      story_set=self,
-      shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
-      expectations=expectations))
-
-    self.AddStory(PixelTestsPage(
-      url='file://../../data/gpu/pixel_offscreenCanvas_webgl_commit_worker.html',
-      name=base_name + '.OffscreenCanvasWebGLRedBoxWorker' + es3_suffix,
-      test_rect=[0, 0, 300, 300],
-      revision=2,
-      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 + '.OffscreenCanvasAccelerated2D' + 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_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_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