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 24 matching lines @@
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
 
     self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug.html',
         ['linux'], bug=483282)
 
     # All platforms.
 
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
 
-    self.Fail('conformance2/rendering/attrib-type-match.html', bug=627193)
-
     self.Fail('conformance2/transform_feedback/' +
         'unwritten-output-defaults-to-zero.html', bug=1441) # ANGLE bug
 
     # Avoid a conflict with a Mac expectation by setting
     self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['d3d9', 'd3d11', 'opengl'], bug=483282)
 
     # All platforms with AMD GPU.
     self.Fail('deqp/functional/gles3/multisample.html',
         ['amd'], bug=617290)
 
-    self.Fail('conformance2/rendering/framebuffer-unsupported.html',
-        bug=628861)
+    # Windows only.
 
-    self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
-        bug=1450) # ANGLE bug
-    # self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
-    #     ['mac'], bug=483282)
-    # self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
-    #     ['linux', 'amd', 'intel'], bug=483282)
-
+    self.Fail('conformance/glsl/bugs/' +
+        'pow-of-small-constant-in-user-defined-function.html',
+        ['win'], bug=485641)
+    self.Fail('conformance/misc/uninitialized-test.html',
+        ['win'], bug=483282)
+    self.Fail('conformance/rendering/point-specific-shader-variables.html',
+        ['win'], bug=616335)
+    self.Fail('conformance/textures/canvas/' +
+        'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
+        ['win'], bug=483282)
+    self.Fail('conformance/textures/canvas/' +
+        'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+        ['win'], bug=483282)
+    self.Fail('conformance/textures/canvas/' +
+        'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
+        ['win'], bug=483282)
+    self.Fail('conformance/textures/webgl_canvas/' +
+        'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
+        ['win'], bug=483282)
+    self.Fail('conformance/textures/webgl_canvas/' +
+        'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+        ['win'], bug=483282)
+    self.Fail('conformance/textures/webgl_canvas/' +
+        'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
+        ['win'], bug=483282)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
         'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
         ['win'], bug=628954)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
         'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
         ['win'], bug=628954)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
         'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
         ['win'], bug=628954)
 
-    # Windows only.
-    self.Fail('conformance/glsl/bugs/' +
-              'pow-of-small-constant-in-user-defined-function.html',
-        ['win'], bug=485641)
-    self.Fail('conformance/misc/uninitialized-test.html',
-        ['win'], bug=483282)
-    self.Fail('conformance/rendering/point-specific-shader-variables.html',
-        ['win'], bug=616335)
-    self.Fail('conformance/textures/canvas/' +
-              'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
-              ['win'], bug=483282)
-    self.Fail('conformance/textures/canvas/' +
-              'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
-              ['win'], bug=483282)
-    self.Fail('conformance/textures/canvas/' +
-              'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
-              ['win'], bug=483282)
-    self.Fail('conformance/textures/webgl_canvas/' +
-              'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
-              ['win'], bug=483282)
-    self.Fail('conformance/textures/webgl_canvas/' +
-              'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
-              ['win'], bug=483282)
-    self.Fail('conformance/textures/webgl_canvas/' +
-              'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
-              ['win'], bug=483282)
     self.Fail('deqp/data/gles2/shaders/functions.html',
         ['win'], bug=478572)
 
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
 
     # ANGLE bug id
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['win'], bug=1246)
     self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
@@ skipping 92 matching lines @@
         ['win', 'intel'], bug=628863)
 
     # It's unfortunate that these suppressions need to be so broad, but it
     # looks like the D3D11 device can be lost spontaneously on this
     # configuration while running basically any test.
     self.Flaky('conformance/*', ['win', 'intel'], bug=628395)
     self.Flaky('conformance2/*', ['win', 'intel'], bug=628395)
     self.Flaky('deqp/*', ['win', 'intel'], bug=628395)
 
     # Mac only.
+    self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
+        ['mac'], bug=483282)
     self.Flaky('deqp/functional/gles3/shaderindexing/varying.html',
         ['mac'], bug=619264)
     self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
         ['mac'], bug=617820)
     self.Fail('deqp/data/gles3/shaders/linkage.html',
         ['mac'], bug=601821)
 
     # This one's flaky on AMD, NVIDIA and Intel GPUs, but the
     # GPU-specific expectations aren't working properly.
     self.Fail('deqp/functional/gles3/shaderpackingfunction.html',
@@ skipping 305 matching lines @@
 
     self.Fail('deqp/data/gles3/shaders/functions.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/clipping.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Flaky('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_2d.html',
         ['linux', 'amd', 'intel'], bug=618447)
+    self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
+        ['linux', 'amd', 'intel'], bug=483282)
 
     # Linux with ANGLE only
     self.Fail('conformance/misc/uninitialized-test.html',
         ['linux', 'opengl'], bug=483282)
     self.Fail('conformance/textures/webgl_canvas/' +
         'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
         ['linux', 'opengl'], bug=483282)
     self.Fail('conformance/textures/webgl_canvas/' +
         'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
         ['linux', 'opengl'], bug=483282)
@@ skipping 354 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'])