Roll WebGL 53ea416..c281bfe

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index 7ef537f72c1d04395f221b17f18d92bea79500be..51a91d5bbf7eaa0ac14271733eea3928c74af30b 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -115,19 +115,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
               ['win'], bug=483282)
     self.Fail('deqp/data/gles2/shaders/functions.html',
         ['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.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win'], bug=626068)
-
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['win'], bug=624506)
 
@@ -142,10 +133,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     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)
+    # La la la la la la la la la la ...
 
     # Win / AMD
     self.Fail('deqp/functional/gles3/texturespecification/' +
@@ -169,6 +157,9 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', ('amd', 0x6779)], bug=483282)
 
+    self.Fail('deqp/functional/gles3/transformfeedback/*',
+        ['win', ('amd', 0x6779)], bug=626068)
+
     # 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.