Roll WebGL 331fe3a..9ffa3b5

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, url_prefixes=None, is_asan=False):
     super(WebGL2ConformanceExpectations, self).__init__(
@@ skipping 23 matching lines @@
         ['win', 'mac', 'linux'])
 
     # ========================
     # Conformance expectations
     # ========================
 
     # Too slow (take about one hour to run)
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
 
     # All platforms.
-
-    # Remove the following when the test update is rolled into Chromium:
-    # https://github.com/KhronosGroup/WebGL/pull/2424/files
-    self.Fail('conformance2/rendering/instanced-arrays.html', bug=736070)
-    self.Fail('deqp/functional/gles3/negativevertexarrayapi.html', bug=736070)
-    # When remove the above entry, please uncomment the one for Mac NVidia.
-
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
     self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
 
     self.Fail('conformance2/rendering/depth-stencil-feedback-loop.html',
         bug=660844) # WebGL 2.0.1
     self.Fail('conformance2/rendering/rendering-sampling-feedback-loop.html',
         bug=660844) # WebGL 2.0.1
     self.Fail('conformance2/textures/misc/' +
         'integer-cubemap-specification-order-bug.html',
         bug=483282) # owner:cwallez, test might be buggy
@@ skipping 286 matching lines @@
     self.Fail('deqp/functional/gles3/shaderderivate_dfdx.html',
         ['win', 'passthrough', 'd3d11'], bug=602688)
     self.Fail('deqp/functional/gles3/shaderderivate_dfdy.html',
         ['win', 'passthrough', 'd3d11'], bug=602688)
     self.Fail('deqp/functional/gles3/shaderderivate_fwidth.html',
         ['win', 'passthrough', 'd3d11'], bug=602688)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['win', 'passthrough', 'd3d11'], bug=602688)
 
     # Mac only.
+    self.Fail('conformance2/renderbuffers/' +
+        'multisampled-depth-renderbuffer-initialization.html',
+        ['mac'], bug=696126)
 
     # Regressions in 10.12.4.
     self.Fail('conformance2/textures/misc/tex-base-level-bug.html',
         ['sierra'], bug=705865)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['sierra'], bug=705865)
 
     # Fails on multiple GPU types.
     self.Fail('conformance2/glsl3/vector-dynamic-indexing-swizzled-lvalue.html',
         ['mac'], bug=709351)
@@ skipping 49 matching lines @@
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_29.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_32.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_34.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     self.Fail('deqp/functional/gles3/pixelbufferobject.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
-    #self.Fail('deqp/functional/gles3/negativevertexarrayapi.html',
-    #    ['mac', ('nvidia', 0xfe9)], bug=483282)
+    self.Fail('deqp/functional/gles3/negativevertexarrayapi.html',
+        ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/shaderindexing/varying.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'teximage2d_pbo_2d_00.html',
         ['mac', ('nvidia', 0xfe9)], bug=614174)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'teximage2d_pbo_2d_01.html',
         ['mac', ('nvidia', 0xfe9)], bug=614174)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texsubimage2d_pbo_2d_00.html',
@@ skipping 727 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'])