Roll WebGL conformance tests to 2cd3af21

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
index 8ee8f43142288a72dbb9e153b8397d7e824534a0..7f176d80c28aafa38d8702015fcc18134b04c974 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
@@ -27,6 +27,7 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
     # Fails on all platforms
     self.Fail('conformance/glsl/misc/shaders-with-mis-matching-uniforms.html',
         bug=351396)
+    self.Fail('conformance/glsl/misc/shaders-with-uniform-structs.html')

[Zhenyao Mo, 2014/07/31 19:48:27]

Could you remove the failing tests above
(shaders-with-mis-matching-uniforms.html) as it's passing now?  And set the
bug=351396 to this new entry?

 
     # Flaky on Win
     self.Fail('conformance/extensions/webgl-draw-buffers.html',
@@ -35,6 +36,8 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
     # Win failures
     self.Fail('conformance/glsl/misc/struct-equals.html',
         ['win'], bug=391957)
+    self.Fail('conformance/rendering/negative-one-index.html',
+        ['win'])

[Zhenyao Mo, 2014/07/31 19:48:28]

Can you add bug=396058 to this new entry?

 
     # Win7 / Intel failures
     self.Fail('conformance/rendering/gl-scissor-test.html',
@@ -48,6 +51,11 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
     self.Fail('conformance/glsl/misc/shader-with-array-of-structs-uniform.html',
         ['win7', 'intel', 'nvidia'], bug=373972)
 
+    # Linux failures
+    self.Fail(
+        'conformance/glsl/constructors/glsl-construct-vec-mat-corner-cases.html',
+        ['linux'])

[Zhenyao Mo, 2014/07/31 19:48:27]

I think if you update this file, you will see a bunch of constructors related
Linux NVIDIA failures.  This one should go together with them, using the same
bug ID.

+
     # Mac failures
     self.Fail('conformance/glsl/misc/shader-struct-scope.html',
         ['mac'], bug=368910)