Roll WebGL 4951bdd..c403207

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 21 matching lines @@
     # 2.0.1 OR LATER
 
     # Too slow (take about one hour to run)
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
 
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
     self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
 
     # All platforms.
 
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-              'tex-2d-rgba-rgba-unsigned_byte.html', bug=483282)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-              'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html', bug=483282)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-              'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html', bug=483282)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-              'tex-2d-rgb-rgb-unsigned_byte.html', bug=483282)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-              'tex-2d-rgb-rgb-unsigned_short_5_6_5.html', bug=483282)
-
     self.Fail('deqp/data/gles3/shaders/linkage.html', bug=601821)
 
     # Mark this test Flaky on all platforms but Intel Linux that is failing
     # reliably.
     self.Flaky('conformance2/query/occlusion-query.html',
         ['win', 'mac'], bug=603168)
     self.Flaky('conformance2/query/occlusion-query.html',
         ['linux', 'nvidia', 'amd'], bug=603168)
 
     self.Fail('conformance2/rendering/attrib-type-match.html', bug=627193)
 
     self.Fail('conformance2/transform_feedback/' +
         'unwritten-output-defaults-to-zero.html', bug=1441) # ANGLE bug
 
     # 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)
 
+    self.Fail('conformance2/rendering/framebuffer-unsupported.html',
+        bug=628861)
+
+    # Linux passes because 2D canvas is not GPU accelerated.
+    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgba-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=628954)
+    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
+        ['win', 'mac'], bug=628954)
+    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+        ['win', 'mac'], bug=628954)
+    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgb-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=628954)
+    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
+        ['win', 'mac'], bug=628954)
+
     # Windows only.
     self.Fail('conformance/glsl/bugs/' +
               'pow-of-small-constant-in-user-defined-function.html',
         ['win'], bug=485641)
     self.Fail('conformance/misc/uninitialized-test.html',
         ['win'], bug=483282)
     self.Fail('conformance/rendering/point-specific-shader-variables.html',
         ['win'], bug=616335)
     self.Fail('conformance/textures/canvas/' +
               'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
@@ skipping 452 matching lines @@
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_byte.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
                ['linux'], bug=627525)
 
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
 
-    self.Fail('deqp/functional/gles3/fbodepthbuffer.html',
-        ['linux'], bug=483282)
-
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_cube.html',
         ['linux'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['linux'], bug=624506)
 
     # Multi-vendor failures.
 
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
         ['linux', 'amd', 'intel'], bug=483282)
@@ skipping 395 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'])