Add more WebGL pixel tests.

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 27 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 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 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)
     # 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)
 
-    # On OS X, test the IOSurface 2D Canvas compositing path.
     if sys.platform.startswith('darwin'):
+      # On OS X, test the IOSurface 2D Canvas compositing path.
       self.AddStory(PixelTestsPage(
         url='file://../../data/gpu/pixel_canvas2d_accelerated.html',
         name=base_name + '.IOSurface2DCanvas',
         test_rect=[0, 0, 400, 400],
         revision=1,
         story_set=self,
         shared_page_state_class=IOSurface2DCanvasSharedPageState,
         expectations=expectations))
       self.AddStory(PixelTestsPage(
         url='file://../../data/gpu/pixel_canvas2d_webgl.html',
         name=base_name + '.IOSurface2DCanvasWebGL',
         test_rect=[0, 0, 300, 300],
         revision=2,
         story_set=self,
         shared_page_state_class=IOSurface2DCanvasSharedPageState,
         expectations=expectations))
 
+      # On OS X, test WebGL non-Chromium Image compositing path.
+      self.AddStory(PixelTestsPage(
+        url='file://../../data/gpu/pixel_webgl_aa_alpha.html',
+        name=base_name + '.WebGLGreenTriangle.NonChromiumImage.AA.Alpha',
+        test_rect=[0, 0, 300, 300],
+        revision=1,
+        story_set=self,
+        shared_page_state_class=WebGLNonChromiumImageSharedPageState,
+        expectations=expectations))
+
+      self.AddStory(PixelTestsPage(
+        url='file://../../data/gpu/pixel_webgl_noaa_alpha.html',
+        name=base_name + '.WebGLGreenTriangle.NonChromiumImage.NoAA.Alpha',
+        test_rect=[0, 0, 300, 300],
+        revision=1,
+        story_set=self,
+        shared_page_state_class=WebGLNonChromiumImageSharedPageState,
+        expectations=expectations))
+
+      self.AddStory(PixelTestsPage(
+        url='file://../../data/gpu/pixel_webgl_aa_noalpha.html',
+        name=base_name + '.WebGLGreenTriangle.NonChromiumImage.AA.NoAlpha',
+        test_rect=[0, 0, 300, 300],
+        revision=1,
+        story_set=self,
+        shared_page_state_class=WebGLNonChromiumImageSharedPageState,
+        expectations=expectations))
+
+      self.AddStory(PixelTestsPage(
+        url='file://../../data/gpu/pixel_webgl_noaa_noalpha.html',
+        name=base_name + '.WebGLGreenTriangle.NonChromiumImage.NoAA.NoAlpha',
+        test_rect=[0, 0, 300, 300],
+        revision=1,
+        story_set=self,
+        shared_page_state_class=WebGLNonChromiumImageSharedPageState,
+        expectations=expectations))
+
   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_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',
       name=base_name + '.CSS3DBlueBox' + es3_suffix,
       test_rect=[0, 0, 300, 300],
       revision=15,
       story_set=self,
       shared_page_state_class=shared_page_state_class,
       expectations=expectations))
 
     self.AddStory(PixelTestsPage(
-      url='file://../../data/gpu/pixel_webgl.html',
-      name=base_name + '.WebGLGreenTriangle' + es3_suffix,
+      url='file://../../data/gpu/pixel_webgl_aa_alpha.html',
+      name=base_name + '.WebGLGreenTriangle.AA.Alpha' + es3_suffix,
       test_rect=[0, 0, 300, 300],
-      revision=12,
+      revision=1,
       story_set=self,
       shared_page_state_class=shared_page_state_class,
       expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_webgl_noaa_alpha.html',
+      name=base_name + '.WebGLGreenTriangle.NoAA.Alpha' + es3_suffix,

[Ken Russell (switch to Gerrit), 2016/06/01 02:06:07]

I think you'll need to suppress failures of these new tests on all platforms
temporarily until reference images are generated. Could you then double-check
them to make sure they look OK? Links to the images will be in the logs. Thanks.

[erikchen, 2016/06/01 17:07:03]

Done.

+      test_rect=[0, 0, 300, 300],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=shared_page_state_class,
+      expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_webgl_aa_noalpha.html',
+      name=base_name + '.WebGLGreenTriangle.AA.NoAlpha' + es3_suffix,
+      test_rect=[0, 0, 300, 300],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=shared_page_state_class,
+      expectations=expectations))
+
+    self.AddStory(PixelTestsPage(
+      url='file://../../data/gpu/pixel_webgl_noaa_noalpha.html',
+      name=base_name + '.WebGLGreenTriangle.NoAA.NoAlpha' + es3_suffix,
+      test_rect=[0, 0, 300, 300],
+      revision=1,
+      story_set=self,
+      shared_page_state_class=shared_page_state_class,
+      expectations=expectations))
 
     self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_scissor.html',
       name=base_name + '.ScissorTestWithPreserveDrawingBuffer' + es3_suffix,
       test_rect=[0, 0, 300, 300],
       revision=0, # This is not used.
       story_set=self,
       shared_page_state_class=shared_page_state_class,
       expectations=expectations,
       expected_colors='../../data/gpu/pixel_scissor_expectations.json'))
 
     self.AddStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_canvas2d_webgl.html',
       name=base_name + '.2DCanvasWebGL',
       test_rect=[0, 0, 300, 300],
       revision=2,
       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