update webgl cts expectations

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, is_asan=False):
     super(WebGL2ConformanceExpectations, self).__init__(
@@ skipping 178 matching lines @@
         ['mac'], bug=654187)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_30.html',
         ['mac'], bug=654187)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_31.html',
         ['mac'], bug=654187)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_33.html',
         ['mac'], bug=654187)
 
     self.Fail('conformance2/reading/format-r11f-g11f-b10f.html',
         ['mac'], bug=1832) # khronos WebGL issue
-    self.Fail('deqp/functional/gles3/fborender/recreate_color_02.html',
-        ['mac'], bug=679682)
-    self.Fail('deqp/functional/gles3/fborender/resize_01.html',
-        ['mac'], bug=679682)
-    self.Fail('deqp/functional/gles3/fragmentoutput/basic.float.html',
-        ['mac'], bug=679684)
-    self.Fail('deqp/functional/gles3/fragmentoutput/array.float.html',
-        ['mac'], bug=679684)
 
     # Mac Retina NVIDIA
     self.Fail('conformance/textures/misc/cube-map-uploads-out-of-order.html',
         ['mac', ('nvidia', 0xfe9)], bug=473739)
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['mac', ('nvidia', 0xfe9)], bug=641209)
     self.Fail('deqp/functional/gles3/framebufferblit/' +
         'default_framebuffer_04.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('conformance/attribs/gl-disabled-vertex-attrib.html',
@@ skipping 263 matching lines @@
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_01.html',
         ['mac', ('amd', 0x679e)], bug=636648)
     self.Flaky('deqp/functional/gles3/shaderindexing/tmp.html',
         ['mac', ('amd', 0x679e)], bug=659871)
     self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
         ['mac', ('amd', 0x679e)], bug=618464)
     self.Fail('deqp/functional/gles3/shaderoperator/common_functions.html',
         ['mac', ('amd', 0x679e)], bug=483282)
 
     # Mac Multi-vendor failures.
+    self.Fail('deqp/functional/gles3/fborender/recreate_color_02.html',
+        ['mac', 'nvidia', 'amd'], bug=679682)
+    self.Fail('deqp/functional/gles3/fborender/resize_01.html',
+        ['mac', 'nvidia', 'amd'], bug=679682)
+    self.Fail('deqp/functional/gles3/fragmentoutput/basic.float.html',
+        ['mac', 'nvidia', 'amd'], bug=679684)
+    self.Fail('deqp/functional/gles3/fragmentoutput/array.float.html',
+        ['mac', 'nvidia', 'amd'], bug=679684)
     self.Fail('deqp/functional/gles3/fragmentoutput/random_00.html',
         ['mac', 'amd', 'intel'], bug=679690)
     self.Fail('deqp/functional/gles3/fragmentoutput/random_02.html',
         ['mac', 'amd', 'intel'], bug=679690)
     self.Fail('deqp/functional/gles3/fbocolorbuffer/clear.html',
         ['mac', 'amd', 'intel'], bug=679691)
 
     # Mac Intel
 
     # ASAN only
@@ skipping 525 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'])