Enable CopyTextureCHROMIUM in Blink for Tex{Sub}Image2D with more cases

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index b2ecc3c131a6cf8b10c97b387f7e41ad9a7c79ff..3fac7e6f9edf770bcf8e78e903b874f0cbcf54b7 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -51,6 +51,49 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance2/textures/misc/' +
         'integer-cubemap-specification-order-bug.html',
         bug=483282) # owner:cwallez, test might be buggy
+    self.Fail('conformance/textures/misc/tex-sub-image-2d-bad-args.html',
+        bug=625738)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-srgb8-rgb-unsigned_byte.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-srgb8_alpha8-rgba-unsigned_byte.html',
+        bug=612542)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-2d-srgb8-rgb-unsigned_byte.html',
+        bug=612542)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-2d-srgb8_alpha8-rgba-unsigned_byte.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+        'tex-2d-srgb8-rgb-unsigned_byte.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+        'tex-2d-srgb8_alpha8-rgba-unsigned_byte.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgb9_e5-rgb-half_float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+        'tex-2d-rgb9_e5-rgb-float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+        'tex-2d-rgb9_e5-rgb-half_float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/webgl_canvas/' +
+        'tex-2d-rgb9_e5-rgb-float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/webgl_canvas/' +
+        'tex-2d-rgb9_e5-rgb-half_float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgb9_e5-rgb-float.html',
+        bug=612542)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-2d-rgb9_e5-rgb-half_float.html',
+        bug=612542)
 
     # Windows only.
     self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
@@ -229,6 +272,19 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance2/reading/format-r11f-g11f-b10f.html',
         ['mac'], bug=1832) # khronos WebGL issue
 
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
+        ['mac'], bug=612542)
+    self.Fail('conformance2/textures/' +
+        'canvas_sub_rectangle/tex-2d-rgb5_a1-rgba-unsigned_byte.html',
+        ['mac'], bug=612542)
+    self.Fail('conformance2/textures/' +
+        'image_bitmap_from_canvas/tex-2d-rgb5_a1-rgba-unsigned_byte.html',
+        ['mac'], bug=612542)
+    self.Fail('conformance2/textures/webgl_canvas/' +
+        'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
+        ['mac'], bug=612542)
+
     # Mac Retina NVIDIA
     self.Fail('conformance/textures/misc/cube-map-uploads-out-of-order.html',
         ['mac', ('nvidia', 0xfe9)], bug=473739)
@@ -534,24 +590,12 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
 
     # Mac Intel
     self.Fail(
-      'conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-float.html',
-      ['sierra', 'intel'], bug=663188)
-    self.Fail(
-      'conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-half_float.html',
-      ['sierra', 'intel'], bug=663188)
-    self.Fail(
       'conformance2/textures/canvas/tex-3d-rgb9_e5-rgb-float.html',
       ['sierra', 'intel'], bug=663188)
     self.Fail(
       'conformance2/textures/canvas/tex-3d-rgb9_e5-rgb-half_float.html',
       ['sierra', 'intel'], bug=663188)
     self.Fail(
-      'conformance2/textures/webgl_canvas/tex-2d-rgb9_e5-rgb-float.html',
-      ['sierra', 'intel'], bug=663188)
-    self.Fail(
-      'conformance2/textures/webgl_canvas/tex-2d-rgb9_e5-rgb-half_float.html',
-      ['sierra', 'intel'], bug=663188)
-    self.Fail(
       'conformance2/textures/webgl_canvas/tex-3d-rgb9_e5-rgb-float.html',
       ['sierra', 'intel'], bug=663188)
     self.Fail(