Fix failing transferToImageBitmap layout tests and commit pixel test on Mac

content/test/gpu/page_sets/pixel_tests.py

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 28bf9b4ed254b93118d4cbddd6faa5104ef0d1dd..115b8fb34705b17d6363aa7dc053abb0493711be 100644
--- a/content/test/gpu/page_sets/pixel_tests.py
+++ b/content/test/gpu/page_sets/pixel_tests.py
@@ -175,10 +175,29 @@ class PixelTestsStorySet(story_set_module.StorySet):
       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))
@@ -187,7 +206,7 @@ class PixelTestsStorySet(story_set_module.StorySet):
       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))