Roll WebGL 0e41a33..04fa5ca

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.Skip('deqp/functional/gles3/fbomultisample.html', bug=483282)
     self.Skip('deqp/functional/gles3/fborender.html', bug=483282)
     self.Skip('deqp/functional/gles3/fragmentoutput.html', bug=483282)
     self.Skip('deqp/functional/gles3/framebufferblit.html', bug=483282)
     self.Skip('deqp/data/gles3/shaders/linkage.html', bug=601821)
     self.Skip('deqp/functional/gles3/occlusionquery.html', bug=483282)
     self.Skip('deqp/functional/gles3/shaderoperator.html', bug=483282)
     self.Skip('deqp/functional/gles3/shaderpackingfunction.html', bug=483282)
     self.Skip('deqp/functional/gles3/sync.html', bug=483282)
     self.Skip('deqp/functional/gles3/textureshadow/*.html', bug=483282)
-    self.Skip('deqp/functional/gles3/uniformbuffers.html', bug=483282)
 
     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)
 
     self.Fail('conformance2/rendering/draw-buffers.html', bug=617410)
 
     # All platforms when running ANGLE
@@ skipping 263 matching lines @@
 
     # Mac only.
     self.Fail('deqp/functional/gles3/texturefiltering/cube_formats_*',
         ['mac'], bug=606074)
     self.Fail('deqp/functional/gles3/texturefiltering/cube_sizes_*',
         ['mac'], bug=606074)
     self.Fail('deqp/functional/gles3/texturefiltering/cube_combinations_*',
         ['mac'], bug=606074)
     self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
         ['mac'], bug=617820)
+    self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
+        ['mac'], bug=618464)
 
     self.Skip('deqp/functional/gles3/texturespecification/' +
         'basic_copyteximage2d.html',
         ['mac'], bug=577144)
     self.Skip('deqp/functional/gles3/texturespecification/' +
         'basic_copytexsubimage2d.html',
         ['mac'], bug=577144)
     self.Fail('deqp/functional/gles3/textureformat/unsized_2d_array.html',
         ['mac'], bug=577144)
     self.Fail('deqp/functional/gles3/textureformat/unsized_3d.html',
@@ skipping 427 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'])