Update Maps and WebGL conformance expectations for Nexus 6P.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 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.
 import os
 
 from gpu_tests.gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 284 matching lines @@
               'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('conformance/textures/image_bitmap_from_image_bitmap/' +
               'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('conformance/uniforms/uniform-samplers-test.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('deqp/data/gles2/shaders/preprocessor.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
 
-    # Nexus 6
+    # Nexus 6 (Adreno 420) and 6P (Adreno 430)
     self.Fail('WebglExtension.EXT_sRGB',
-              ['android', ('qualcomm', 'Adreno (TM) 420')])
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')])
     self.Fail('conformance/context/context-size-change.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/extensions/oes-texture-half-float.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/extensions/oes-texture-half-float-with-canvas.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/extensions/' +
               'oes-texture-half-float-with-image-data.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/extensions/oes-texture-half-float-with-image.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/extensions/oes-texture-half-float-with-video.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/extensions/webgl-compressed-texture-atc.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/glsl/bugs/gl-fragcoord-multisampling-bug.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/bugs/qualcomm-crash.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     # This test is skipped because running it causes a future test to fail.
     # The list of tests which may be that future test is very long. It is
     # almost (but not quite) every webgl conformance test.
     self.Skip('conformance/glsl/misc/shader-struct-scope.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=614550)
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/rendering/gl-viewport-test.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/textures/svg_image/' +
@@ skipping 255 matching lines @@
     # shell.
     self.Skip('conformance/extensions/oes-texture-float-with-video.html',
               ['android', 'qualcomm'], bug=499555)
     # Nexus 5 failures
     self.Fail('conformance/glsl/bugs/struct-constructor-highp-bug.html',
               ['android', ('qualcomm', 'Adreno (TM) 330')], bug=559342)
     self.Fail('conformance/glsl/bugs/qualcomm-loop-with-continue-crash.html',
               ['android', ('qualcomm', 'Adreno (TM) 330')], bug=527761)
     self.Fail('conformance/glsl/bugs/sketchfab-lighting-shader-crash.html',
               ['android', ('qualcomm', 'Adreno (TM) 330')], bug=551937)
-    # Nexus 6 failures only
+    # Nexus 6 and 6P failures
     self.Fail('conformance/context/' +
               'context-attributes-alpha-depth-stencil-antialias.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/context/premultiplyalpha-test.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/extensions/oes-texture-float-with-image-data.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=499555)
     self.Fail('conformance/extensions/oes-texture-float-with-image.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=499555)
     self.Fail('conformance/textures/image_bitmap_from_blob/*',
         ['android', ('qualcomm', 'Adreno (TM) 420')], bug=585108)
     self.Fail('conformance/textures/image_bitmap_from_canvas/*',
         ['android', ('qualcomm', 'Adreno (TM) 420')], bug=585108)
     self.Fail('conformance/textures/image_bitmap_from_image/*',
         ['android', ('qualcomm', 'Adreno (TM) 420')], bug=585108)
     self.Fail('conformance/textures/image_bitmap_from_image_data/*',
         ['android', ('qualcomm', 'Adreno (TM) 420')], bug=585108)
     self.Fail('conformance/textures/image_bitmap_from_image_bitmap/*',
         ['android', ('qualcomm', 'Adreno (TM) 420')], bug=598262)
@@ skipping 23 matching lines @@
     self.Skip('conformance/more/functions/bindBufferBadArgs.html',
               ['android', 'android-webview-shell',
                ('qualcomm', 'Adreno (TM) 420')], bug=499874)
     self.Fail('conformance/rendering/gl-scissor-test.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/textures/misc/' +
               'copy-tex-image-and-sub-image-2d.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/textures/misc/' +
               'tex-image-and-sub-image-2d-with-array-buffer-view.html',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=499555)
     self.Fail('conformance/textures/canvas/*',
-              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
+              ['android',
+               ('qualcomm', 'Adreno (TM) 420'),
+               ('qualcomm', 'Adreno (TM) 430')], bug=499555)
     self.Fail('conformance/textures/image_data/*',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/textures/image/*',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/textures/webgl_canvas/*',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     # Nexus 9 failures
     self.Skip('conformance/extensions/oes-texture-float-with-video.html',
               ['android', 'nvidia'], bug=499555) # flaky
     self.Fail('conformance/glsl/bugs/multiplication-assignment.html',
@@ skipping 88 matching lines @@
     self.Fail('conformance/textures/misc/texture-npot.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-npot-video.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-size.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Skip('conformance/uniforms/uniform-default-values.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)