Update WebGL/WebGL2 conformance expectations

Update the expectations file of WebGL/WebGL2 conformance test:
- Add driver tags to Intel-specific issues.
- Put Intel-specific issues together.

Change-Id: I2765d45153716377c9b773c8a234a6bbef9a1d6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1687387Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Lin Sun <lin.sun@intel.com>
Cr-Commit-Position: refs/heads/master@{#678480}

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

@@ -106,6 +106,26 @@ crbug.com/751849 [ win7 debug nvidia d3d11 passthrough ] conformance/extensions/
 # Win failures     #
 ####################
 
+# Intel flaky issues
+crbug.com/825338 [ win intel ] conformance/extensions/oes-texture-float-with-video.html [ RetryOnFailure ]
+crbug.com/929009 [ win intel ] conformance/glsl/misc/shader-with-non-reserved-words.html [ RetryOnFailure ]
+crbug.com/854100 [ win10 intel opengl ] conformance/glsl/variables/gl-pointcoord.html [ RetryOnFailure ]
+crbug.com/602688 [ win intel d3d11 passthrough ] conformance/renderbuffers/framebuffer-state-restoration.html [ RetryOnFailure ]
+
+# Intel failed issues
+crbug.com/angleproject/2722 [ win intel vulkan passthrough ] conformance/rendering/clipping-wide-points.html [ Failure ]
+[ win7 intel no-passthrough ] conformance/textures/misc/copy-tex-image-and-sub-image-2d.html [ Failure ]
+
+# Intel driver issues
+# This is an OpenGL driver bug on Intel platform and it is fixed in
+# Intel Driver 25.20.100.6444.
+# Case no-over-optimization-on-uniform-array-09 always fail if run
+# case biuDepthRange_001_to_002 first.
+# Temporarily skip these two cases now because this issue blocks
+# WEBGL_video_texture implementation.
+crbug.com/907195 [ win intel opengl passthrough intel_lt_25.20.100.6444 ] conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html [ Skip ]
+crbug.com/907195 [ win intel opengl passthrough intel_lt_25.20.100.6444 ] conformance/uniforms/no-over-optimization-on-uniform-array-09.html [ Skip ]
+
 # TODO(kbr): re-enable suppression for same test below once fixed.
 crbug.com/angleproject/2103 [ win ] conformance/glsl/bugs/sampler-struct-function-arg.html [ Skip ]
 
@@ -143,22 +163,6 @@ crbug.com/728670 [ win10 nvidia-0x1cb3 ] conformance/textures/image_bitmap_from_
 # Win7 / NVIDIA D3D9 failures
 crbug.com/690248 [ win7 nvidia d3d9 ] conformance/canvas/canvas-test.html [ RetryOnFailure ]
 
-# Win / Intel
-crbug.com/825338 [ win intel ] conformance/extensions/oes-texture-float-with-video.html [ RetryOnFailure ]
-crbug.com/929009 [ win intel ] conformance/glsl/misc/shader-with-non-reserved-words.html [ RetryOnFailure ]
-
-# This is an OpenGL driver bug on Intel platform and it is fixed in
-# Intel Driver 25.20.100.6444.
-# Case no-over-optimization-on-uniform-array-09 always fail if run
-# case biuDepthRange_001_to_002 first.
-# Temporarily skip these two cases now because this issue blocks
-# WEBGL_video_texture implementation.
-crbug.com/907195 [ win intel opengl passthrough intel_lt_25.20.100.6444 ] conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html [ Skip ]
-crbug.com/907195 [ win intel opengl passthrough intel_lt_25.20.100.6444 ] conformance/uniforms/no-over-optimization-on-uniform-array-09.html [ Skip ]
-
-# Win7 / Intel failures
-[ win7 intel no-passthrough ] conformance/textures/misc/copy-tex-image-and-sub-image-2d.html [ Failure ]
-
 # Win AMD failures
 # This test is probably flaky on all AMD, but only visible on the
 # new AMD (the whole test suite is flaky on the old config).
@@ -212,12 +216,6 @@ crbug.com/952887 [ win amd-0x699f opengl passthrough ] conformance/rendering/mul
 # Mark ANGLE's OpenGL as flaky on Windows Amd
 crbug.com/582083 [ win amd opengl ] conformance/* [ RetryOnFailure ]
 
-# Win / OpenGL / Intel HD 530 / 630 failures
-crbug.com/854100 [ win10 intel opengl ] conformance/glsl/variables/gl-pointcoord.html [ RetryOnFailure ]
-
-# Win / Intel / Passthrough command decoder
-crbug.com/602688 [ win intel d3d11 passthrough ] conformance/renderbuffers/framebuffer-state-restoration.html [ RetryOnFailure ]
-
 # D3D9 / Passthrough command decoder
 crbug.com/angleproject/2192 [ win d3d9 passthrough ] conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html [ Failure ]
 crbug.com/angleproject/2192 [ win d3d9 passthrough ] conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html [ Failure ]
@@ -295,9 +293,6 @@ crbug.com/979641 [ win nvidia vulkan passthrough ] conformance/canvas/viewport-u
 crbug.com/964331 [ win10 nvidia-0x2184 vulkan passthrough ] conformance/ogles/GL/pow/pow_009_to_016.html [ Failure ]
 crbug.com/964331 [ win10 nvidia-0x2184 vulkan passthrough ] conformance/ogles/GL/pow/pow_017_to_024.html [ Failure ]
 
-# Vulkan / Win / Intel / Passthrough command decoder
-crbug.com/angleproject/2722 [ win intel vulkan passthrough ] conformance/rendering/clipping-wide-points.html [ Failure ]
-
 # Vulkan / Win / AMD / Passthrough command decoder
 crbug.com/angleproject/2931 [ win amd vulkan passthrough ] conformance/buffers/buffer-data-dynamic-delay.html [ Failure ]
 crbug.com/angleproject/2918 [ win amd vulkan passthrough ] conformance/canvas/to-data-url-test.html [ Failure ]
@@ -358,9 +353,13 @@ crbug.com/948218 [ mac debug nvidia-0xfe9 ] conformance/glsl/misc/shader-with-no
 # Linux failures   #
 ####################
 
-# Already fixed with Mesa 17.1.6
+# Intel driver issues
 crbug.com/680675 [ linux intel mesa_lt_17.1.6 ] conformance/extensions/webgl-compressed-texture-astc.html [ Failure ]
 
+# The following two tests only fail on Linux/Intel with Mesa 18.0.5,
+# not on Mesa 17.1.4 with the same Intel HD 630 GPU.
+crbug.com/928530 [ linux intel no-passthrough ] conformance/programs/program-test.html [ Failure ]
+
 # NVIDIA
 crbug.com/524144 [ linux nvidia no-passthrough ] conformance/extensions/oes-element-index-uint.html [ RetryOnFailure ]
 crbug.com/596622 [ linux nvidia ] conformance/textures/image/tex-2d-rgb-rgb-unsigned_byte.html [ RetryOnFailure ]
@@ -393,10 +392,6 @@ crbug.com/angleproject/1007 [ linux amd opengl passthrough ] conformance/glsl/mi
 crbug.com/965594 [ linux amd opengl passthrough ] conformance/more/conformance/quickCheckAPI-S_V.html [ RetryOnFailure ]
 crbug.com/965594 [ linux amd opengl passthrough ] conformance/more/conformance/webGLArrays.html [ RetryOnFailure ]
 
-# The following two tests only fail on Linux/Intel with Mesa 18.0.5,
-# not on Mesa 17.1.4 with the same Intel HD 630 GPU.
-crbug.com/928530 [ linux intel no-passthrough ] conformance/programs/program-test.html [ Failure ]
-
 
 ####################
 # Android failures #

content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

@@ -16,8 +16,10 @@ from gpu_tests import webgl_test_util
 # expectations files.
 EXPECTATIONS_DRIVER_TAGS = frozenset([
     'intel_lt_25.20.100.6444',
+    'intel_lt_25.20.100.6577',
+    'mesa_lt_17.1.6',
     'mesa_lt_17.3.9',
-    'mesa_lt_17.1.6'
+    'mesa_lt_19.1.2'
 ])
 
 # Driver tag format: VENDOR_OPERATION_VERSION