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 157 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_transferToImageBitmap_main.html',
+      name=base_name + '.OffscreenCanvasTransferToImageBitmap' + 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_transferToImageBitmap_worker.html',
+      name=base_name + '.OffscreenCanvasTransferToImageBitmapWorker' + \
+        es3_suffix,
+      test_rect=[0, 0, 300, 300],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=EnableExperimentalCanvasFeaturesSharedPageState,
+      expectations=expectations))

[Ken Russell (switch to Gerrit), 2016/09/26 18:21:47]

Could you add these two new pages in __init__, above, instead of _AddAllPages?
The pages in _AddAllPages are supposed to run both with and without
--enable-unsafe-es3-apis, but that requires the use of the incoming
shared_page_state_class rather than overriding it here.

You can just add these right after the call to:

     self._AddAllPages(expectations, base_name, False)

with a comment like

# Pages requiring the use of --enable-experimental-canvas-features.

It'd be great if you could also move the two entries below for
OffscreenCanvasWebGLGreenBox and OffscreenCanvasWebGLRedBoxWorker. Thanks.

(Your new tests don't need to run in both modes, so you don't need the
es3_suffix. You can also remove the test expectations entries for the ES3
variants of your tests.)

[xidachen, 2016/09/26 19:24:03]

Thank you for pointing it out. That makes perfect sense. In the new patch, I
move all these tests to the __init__ part, and remove the es3 suffix.

+
+    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,
+      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' + es3_suffix,
       test_rect=[0, 0, 300, 300],
-      revision=2,
+      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' + es3_suffix,
       test_rect=[0, 0, 350, 350],
       revision=1,
       story_set=self,
@@ skipping 90 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