gpu: WebGL test expectations update for Mac NVIDIA.

TBR=kbr@chromium.org

Bug: 1037650
Change-Id: I1172bf08c5de2ddc4ea06c1b22019015074aae81
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1982224Reviewed-by: Khushal <khushalsagar@chromium.org>
Commit-Queue: Khushal <khushalsagar@chromium.org>
Auto-Submit: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727506}

content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt

@@ -414,13 +414,8 @@ crbug.com/795052 [ mac nvidia-0xfe9 ] conformance2/uniforms/draw-with-uniform-bl
 crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/glsl3/compound-assignment-type-combination.html [ RetryOnFailure ]
 crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/query/occlusion-query.html [ RetryOnFailure ]
 crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/state/gl-object-get-calls.html [ RetryOnFailure ]
-crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-r8-red-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html [ RetryOnFailure ]
-crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb16f-rgb-half_float.html [ RetryOnFailure ]
-crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html [ RetryOnFailure ]
 crbug.com/911772 [ mac nvidia-0xfe9 ] conformance2/textures/canvas/tex-3d-r16f-red-half_float.html [ RetryOnFailure ]
 crbug.com/929398 [ mac nvidia-0xfe9 no-passthrough ] conformance2/glsl3/tricky-loop-conditions.html [ Failure ]
-crbug.com/934556 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-3d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html [ RetryOnFailure ]
 crbug.com/952282 [ mac nvidia-0xfe9 ] conformance2/rendering/framebuffer-unsupported.html [ RetryOnFailure ]
 crbug.com/965209 [ mac nvidia-0xfe9 ] conformance2/samplers/multi-context-sampler-test.html [ RetryOnFailure ]
 crbug.com/756537 [ mac nvidia ] deqp/functional/gles3/shaderoperator/* [ Failure ]
@@ -429,21 +424,9 @@ crbug.com/1022831 [ mac nvidia-0xfe9 ] deqp/functional/gles3/vertexarrays/single
 crbug.com/1022831 [ mac nvidia-0xfe9 ] deqp/functional/gles3/vertexarrays/single_attribute.usage.dynamic_copy.html [ RetryOnFailure ]
 crbug.com/1022831 [ mac nvidia-0xfe9 ] deqp/functional/gles3/shaderloop_while.html [ RetryOnFailure ]
 crbug.com/1027534 [ mac nvidia-0xfe9 ] conformance2/rendering/uniform-block-buffer-size.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgba32f-rgba-float.html [ Failure ]
 crbug.com/1027776 [ mac nvidia-0xfe9 ] deqp/data/gles3/shaders/conversions.html [ Failure ]
 crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/rendering/framebuffer-texture-level1.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb16f-rgb-float.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgba4-rgba-unsigned_byte.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb8-rgb-unsigned_byte.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rg16f-rg-float.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-r11f_g11f_b10f-rgb-float.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb5_a1-rgba-unsigned_byte.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance/textures/canvas_sub_rectangle/tex-2d-rgba-rgba-unsigned_byte.html [ Failure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rg32f-rg-float.html [ Failure ]
-crbug.com/1037650 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1037650 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/tex-2d-r11f_g11f_b10f-rgb-half_float.html [ RetryOnFailure ]
+crbug.com/1037650 [ mac nvidia-0xfe9 ] conformance2/textures/canvas_sub_rectangle/* [ RetryOnFailure ]
 
 # Mac AMD
 # TODO(kbr): uncomment the following two exepectations after test

content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt

@@ -319,7 +319,8 @@ crbug.com/784817 [ mac nvidia-0xfe9 ] conformance/glsl/bugs/init-array-with-loop
 crbug.com/871352 [ mac debug nvidia-0xfe9 ] conformance/uniforms/uniform-samplers-test.html [ Failure ]
 crbug.com/948218 [ mac debug nvidia-0xfe9 ] conformance/glsl/misc/shader-with-non-reserved-words.html [ Failure ]
 crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance/textures/canvas_sub_rectangle/tex-2d-rgb-rgb-unsigned_short_5_6_5.html [ RetryOnFailure ]
-crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance/textures/canvas_sub_rectangle/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ RetryOnFailure ]
+crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance/textures/canvas_sub_rectangle/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ Failure ]
+crbug.com/1027776 [ mac nvidia-0xfe9 ] conformance/textures/canvas_sub_rectangle/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ RetryOnFailure ]
 
 # Mac / Passthrough command decoder
 crbug.com/989194 [ mac passthrough ] conformance/extensions/oes-texture-half-float.html [ Failure ]