Revert workaround due to perf regression

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):
     super(WebGL2ConformanceExpectations, self).__init__(
@@ skipping 419 matching lines @@
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgrad.html',
         ['mac', 'intel'], bug=483282)
 
     self.Fail('deqp/functional/gles3/framebufferblit/rect_03.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_04.html',
         ['mac', 'intel'], bug=483282)
 
+    self.Fail('conformance/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgba-rgba-unsigned_byte.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgb-rgb-unsigned_byte.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+              'tex-2d-r8-red-unsigned_byte.html',
+              ['mac', 'intel'], bug=665656)
     self.Fail('conformance2/textures/canvas_sub_rectangle/' +
               'tex-2d-r8ui-red_integer-unsigned_byte.html',
               ['mac', 'intel'], bug=665656)
     self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+              'tex-2d-rg8-rg-unsigned_byte.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
               'tex-2d-rg8ui-rg_integer-unsigned_byte.html',
               ['mac', 'intel'], bug=665656)
     self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgb8-rgb-unsigned_byte.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
               'tex-2d-rgb8ui-rgb_integer-unsigned_byte.html',
               ['mac', 'intel'], bug=665656)
     self.Fail('conformance2/textures/canvas_sub_rectangle/' +
+              'tex-2d-rgba8-rgba-unsigned_byte.html',
+              ['mac', 'intel'], bug=665656)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/' +
               'tex-2d-rgba8ui-rgba_integer-unsigned_byte.html',
               ['mac', 'intel'], bug=665656)
 
     self.Fail('conformance2/textures/image_data/' +
         'tex-2d-rgba8ui-rgba_integer-unsigned_byte.html',
         ['mac', 'intel'], bug=665197)
     self.Fail('conformance2/textures/image_data/' +
         'tex-2d-rgb8ui-rgb_integer-unsigned_byte.html',
         ['mac', 'intel'], bug=665197)
     self.Fail('conformance2/textures/image_data/' +
@@ skipping 328 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'])