Roll WebGL afd388c..c9d4d25

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 4f5b7745835e5bb63247a91ce7ee1d5fb800db83..452302da3ef9e49fa2a7e98a9be3ff3facd332a1 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -43,12 +43,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
         bug=664740)
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
-    self.Fail('conformance2/misc/expando-loss-2.html', bug=483282)
     self.Fail('conformance2/rendering/blitframebuffer-test.html', bug=634525)
 
     # Windows only.
-    self.Fail('conformance2/textures/misc/copy-texture-image-luma-format.html',
-        ['win'], bug=638470)
+    # We are awesome!
 
     # Win / NVidia
     self.Flaky('deqp/functional/gles3/fbomultisample*',
@@ -70,8 +68,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
 
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['win', ('amd', 0x6779)], bug=483282)
-    self.Fail('deqp/functional/gles3/fbomultisample.8_samples.html',
-        ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/multisample.html',
         ['win', ('amd', 0x6779)], bug=617290)
 
@@ -126,8 +122,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'intel'], bug=614418)
     self.Flaky('deqp/functional/gles3/textureformat/unsized_3d.html',
         ['win', 'intel'], bug=614418)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
-        ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', 'intel'], bug=483282)
@@ -154,6 +148,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # Fixed on OSX 10.11
     self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
         ['mac'], bug=617820)
+    self.Fail('deqp/functional/gles3/shaderoperator/common_functions.html',
+        ['mac', 'amd'], bug=483282)
 
     self.Fail('conformance2/rendering/' +
         'framebuffer-completeness-unaffected.html',
@@ -370,15 +366,11 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/shaderoperator/' +
         'angle_and_trigonometry_03.html',
         ['mac', 'amd'], bug=483282)
-    self.Fail('deqp/functional/gles3/shaderoperator/common_functions.html',
-        ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderoperator/geometric.html',
         ['mac', 'amd'], bug=483282)
 
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_02.html',
         ['mac', 'amd'], bug=644360)
-    self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
-        ['mac', 'amd'], bug=644360)
 
     # Mac Pro with AMD GPU
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_01.html',
@@ -417,9 +409,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['mac', 'intel'], bug=483282)
 
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
-        'texture.html',
-        ['mac', 'intel'], bug=483282)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturelod.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +