WebGL2: Update Windows 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 100 matching lines @@
         ['win'], bug=478572)
     self.Fail('deqp/functional/gles3/shaderloop_for.html',
         ['win'], bug=617817)
     self.Fail('deqp/functional/gles3/shaderloop_while.html',
         ['win'], bug=617817)
     self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
         ['win'], bug=617817)
 
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
-    self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
-        ['win'], bug=483282)
 
-    self.Fail('deqp/functional/gles3/fbomultisample*',
-        ['win'], bug=483282)
+    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
+        ['win'], bug=626068)
 
-    self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
-        ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['win'], bug=624506)
 
     self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
         ['win'], bug=614573)
 
+    # ANGLE bug id
+    self.Fail('deqp/functional/gles3/fbomultisample*',
+        ['win'], bug=1246)
+    self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
+        ['win'], bug=1246)
+    self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
+        ['win'], bug=1268)
+
     # Windows 8 only.
 
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win8'], bug=587601)
 
     # Win / NVidia
     self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
         ['win', 'nvidia'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_05.html',
         ['win', 'nvidia'], bug=483282)
-    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', 'nvidia'], bug=483282)
 
     # Win / AMD
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texstorage2d_format_depth_stencil.html',
         ['win', ('amd', 0x6779)], bug=614178)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texstorage3d_format_depth_stencil.html',
         ['win', ('amd', 0x6779)], bug=614178)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
         ['win', ('amd', 0x6779)], bug=483282)
 
     self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/2d*',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', ('amd', 0x6779)], bug=483282)
 
-    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', ('amd', 0x6779)], bug=483282)
-
     # It's unfortunate that these suppressions need 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('conformance/*', ['win', ('amd', 0x6779)], bug=491419)
     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)
@@ skipping 37 matching lines @@
         'texelfetchoffset.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/uniformbuffers/*.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/2d_array_*.html',
         ['win', 'intel'], bug=483282)
-    self.Flaky('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', 'intel'], bug=626068)
 
     # 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',
@@ skipping 720 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'])