Roll WebGL 2c4f810..5fdf445

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 44 matching lines @@
 
     # 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/vertexarrays.html',
-        ['win'], bug=483282)
-
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'basic_copyteximage2d.html',
         ['win'], bug=483282)
 
     self.Fail('deqp/functional/gles3/transformfeedback/*.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/negativetextureapi.html',
         ['win'], bug=483282)
 
     self.Fail('deqp/functional/gles3/shaderloop_for.html',
@@ skipping 161 matching lines @@
         ['mac'], bug=612205)
 
     self.Fail('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
     self.Fail('deqp/data/gles3/shaders/scoping.html',
         ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/pixelbufferobject.html',
         ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/negativeshaderapi.html',
         ['mac'], bug=483282)
-    self.Fail('deqp/functional/gles3/vertexarrays.html',
-        ['mac'], bug=483282)
 
     self.Fail('conformance2/textures/misc/compressed-tex-image.html',
         ['mac'], bug=565438)
     self.Fail('conformance2/textures/misc/tex-new-formats.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
         ['mac'], bug=295792)
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/rendering/framebuffer-completeness-unaffected.html',
@@ skipping 86 matching lines @@
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojlodoffset.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturelod.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojlod.html',
         ['mac', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/vertexarrays/' +
+        'single_attribute.normalize.html',
+        ['mac', 'amd'], bug=483282)
 
     # Mac Intel
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['mac', 'intel', 'no_angle'], bug=483282)
 
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderderivate.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/*.html',
@@ skipping 57 matching lines @@
     self.Fail('deqp/functional/gles3/clipping.html',
         ['linux', 'amd', 'intel'], bug=483282)
 
     self.Flaky('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_2d.html',
         ['linux'], bug=618447)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_cube.html',
         ['linux'], bug=483282)
 
-    # Temporary supression due to timeout from perf regression
-    self.Fail('deqp/functional/gles3/vertexarrays.html', ['linux'], bug=618139)
-
     # Linux NVIDIA only.
     self.Fail('conformance2/glsl3/array-complex-indexing.html',
         ['linux', 'nvidia', 'no_angle'], bug=606498)
     self.Fail('deqp/functional/gles3/negativebufferapi.html',
         ['linux', 'nvidia', 'no_angle'], bug=483282)
     self.Fail('deqp/functional/gles3/uniformapi/random.html',
         ['linux', 'nvidia'], bug=621178)
 
     # Linux NVIDIA with ANGLE only
     self.Fail('deqp/functional/gles3/buffercopy.html',
@@ skipping 226 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'])