Roll WebGL 72e7ed9..4da7838

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 28 matching lines @@
     self.Fail('deqp/data/gles3/shaders/linkage.html', bug=601821)
 
     self.Flaky('deqp/functional/gles3/negativefragmentapi.html', bug=604794)
 
     self.Fail('deqp/data/gles3/shaders/preprocessor.html', bug=483282)
 
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
 
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
 
-    # Regression from https://github.com/KhronosGroup/WebGL/pull/1854.
-    self.Fail('deqp/functional/gles3/fbodepthbuffer.html', bug=483282)
-
     # 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)
 
     # Windows only.
     self.Fail('deqp/functional/gles3/shaderloop_for.html',
@@ skipping 34 matching lines @@
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['win'], bug=483282)
 
     self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['win'], bug=624506)
 
     # Windows 8 only.
 
-    self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
-        ['win8'], bug=483282)
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win8'], bug=587601)
 
     # Win / NVidia
     self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
         ['win', 'nvidia'], bug=614573)
     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',
@@ skipping 377 matching lines @@
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_05.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_06.html',
         ['mac', 'intel'], bug=483282)
 
     # Linux only.
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
 
+    self.Fail('deqp/functional/gles3/fbodepthbuffer.html',
+        ['linux'], bug=483282)
+
     # Behavior difference between GL compatibility profile and ES3.
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['linux'], bug=617410)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_cube.html',
         ['linux'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['linux'], bug=624506)
 
     self.Fail('deqp/data/gles3/shaders/functions.html',
@@ skipping 344 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'])