Update WebGL2 conformance test expectations.

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

 # Copyright (c) 2015 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 gpu_tests.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 366 matching lines @@
         'rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=483282)
     self.Fail('conformance2/textures/image_bitmap_from_video/' +
         'tex-image-and-sub-image-2d-with-image-bitmap-from-video-' +
         'rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=483282)
     self.Fail('conformance2/textures/image_bitmap_from_video/' +
         'tex-image-and-sub-image-2d-with-image-bitmap-from-video-' +
         'rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-bitmap-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-bitmap-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+
     self.Fail('conformance2/textures/video/tex-image-and-sub-image-3d' +
         '-with-video-rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=560555)
     self.Fail('conformance2/textures/video/tex-image-and-sub-image-3d' +
         '-with-video-rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=560555)
     self.Fail('conformance2/textures/image_data/tex-image-and-sub-image-3d' +
         '-with-image-data-rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=560555)
     self.Fail('conformance2/textures/image_data/tex-image-and-sub-image-3d' +
@@ skipping 40 matching lines @@
         ['win8'], bug=560555)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-3d' +
         '-with-canvas-rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=560555)
     self.Fail('conformance2/textures/webgl_canvas/tex-image-and-sub-image-3d' +
         '-with-webgl-canvas-rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=560555)
     self.Fail('conformance2/textures/webgl_canvas/tex-image-and-sub-image-3d' +
         '-with-webgl-canvas-rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=560555)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-bitmap-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-bitmap-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
 
     # Windows Debug. Causing assertions in the GPU process which raise
     # a dialog box, so have to skip them rather than mark them as
     # failing.
     self.Skip('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgba8-rgba-unsigned_byte.html',
         ['win', 'debug'], bug=542901)
 
     # Win / AMD flakiness seen on the FYI waterfall.
     # It's unfortunate that this suppression needs to be so broad, but
     # basically any test that uses readPixels is potentially flaky, and
     # it's infeasible to suppress individual failures one by one.
     self.Flaky('conformance2/*', ['win', ('amd', 0x6779)], bug=491419)
     self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419)
 
     # Win / Intel
     self.Fail('conformance2/buffers/uniform-buffers.html',
         ['win', 'intel'], bug=483282)
 
+    # Win7 / NVidia / GeForce GT 730
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-bitmap-' +
+        'r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html',
+        ['win7', ('nvidia', 0xf02)], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-bitmap-' +
+        'r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html',
+        ['win7', ('nvidia', 0xf02)], bug=483282)
+
     # Mac only.
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/scoping.html',
         ['mac'], bug=483282)
     self.Skip('deqp/functional/gles3/defaultvertexattribute.html',
         ['mac'], bug=483282)
     self.Skip('deqp/functional/gles3/floatstatequery.html',
         ['mac'], bug=483282)
     self.Skip('deqp/functional/gles3/texturestatequery.html',
@@ skipping 169 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])