(Reland) Restrict scalarize_vec_and_mat_constructor_args workaround.

It causes incorrect compilation of some shaders. The original graphics
driver bugs that motivated enabling it have been mostly been fixed.

Restrict the workaround to Android O and earlier. The workaround is
known to be needed on some older devices such as the Nexus 5 and 6.

Tested with new WebGL conformance test in
KhronosGroup/WebGL#3214 .

Bug: 1165751
Change-Id: I4efb2e90fbbc42b4e7ab9e94ced377d07fb9a27d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2686261
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Auto-Submit: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#852545}

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

@@ -126,8 +126,6 @@ crbug.com/angleproject/5038 conformance/extensions/ext-color-buffer-half-float.h
 crbug.com/1136231 [ win ] conformance/extensions/s3tc-and-rgtc.html [ Failure ]
 crbug.com/1136231 [ linux ] conformance/extensions/s3tc-and-rgtc.html [ Failure ]
 
-crbug.com/1165751 conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
-
 # Must handle rotated videos on all platforms.
 crbug.com/1136205 conformance/textures/misc/video-rotation.html [ Skip ]
 
@@ -938,6 +936,10 @@ crbug.com/1152590 [ linux amd-0x7340 no-passthrough ] deqp/functional/gles3/inte
 [ android qualcomm ] WebglExtension_WEBGL_compressed_texture_s3tc [ Skip ]
 [ android qualcomm ] WebglExtension_WEBGL_compressed_texture_s3tc_srgb [ Skip ]
 
+# Was too difficult to suppress these failures on individual bots.
+crbug.com/1165751 [ android-lollipop ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
+crbug.com/1165751 [ android-marshmallow ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
+crbug.com/1165751 [ android-nougat ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
 
 # Video tests are flaky. Sometimes the video is black.
 crbug.com/948894 [ android ] conformance/textures/video/* [ RetryOnFailure ]

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

@@ -207,8 +207,6 @@ crbug.com/1082533 [ mac intel ] conformance/textures/misc/texture-copying-and-de
 crbug.com/1136231 [ win ] conformance/extensions/s3tc-and-rgtc.html [ Failure ]
 crbug.com/1136231 [ linux ] conformance/extensions/s3tc-and-rgtc.html [ Failure ]
 
-crbug.com/1165751 conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
-
 # Must handle rotated videos on all platforms.
 crbug.com/1136205 conformance/textures/misc/video-rotation.html [ Skip ]
 
@@ -259,6 +257,8 @@ crbug.com/angleproject/4931 [ win nvidia angle-vulkan passthrough ] conformance/
 # Win / Intel / Vulkan / Passthrough command decoder
 # Technically flaky, but flake rate is too high for RetryOnFailure.
 crbug.com/angleproject/4922 [ win intel angle-vulkan passthrough ] conformance/context/context-attributes-alpha-depth-stencil-antialias.html [ Failure ]
+# Need to adjust tolerances of this test.
+crbug.com/1165751 [ win intel angle-vulkan passthrough ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
 
 ####################
 # Fuchsia failures #
@@ -523,6 +523,11 @@ crbug.com/angleproject/5213 [ linux amd-0x6613 angle-opengl passthrough ] confor
 crbug.com/903903 [ android qualcomm ] conformance/glsl/bugs/sampler-array-struct-function-arg.html [ Failure ]
 crbug.com/478572 [ android qualcomm ] conformance/glsl/bugs/sequence-operator-evaluation-order.html [ Failure ]
 
+# Was too difficult to suppress these failures on individual bots.
+crbug.com/1165751 [ android-lollipop ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
+crbug.com/1165751 [ android-marshmallow ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
+crbug.com/1165751 [ android-nougat ] conformance/glsl/bugs/vector-matrix-constructor-scalarization.html [ Failure ]
+
 # The following test is very slow and therefore times out on Android bot.
 [ android ] conformance/rendering/multisample-corruption.html [ Skip ]
 crbug.com/679697 [ android qualcomm no-passthrough ] conformance/textures/misc/copytexsubimage2d-large-partial-copy-corruption.html [ Failure ]

gpu/config/gpu_driver_bug_list.json

@@ -480,8 +480,15 @@
     },
     {
       "id": 88,
-      "description": "Always rewrite vec/mat constructors to be consistent",
-      "cr_bugs": [398694],
+      "description": "Rewrite vec/mat constructors on older GLSL ES drivers, Android O and earlier",
+      "cr_bugs": [398694, 1165751],
+      "os": {
+        "type": "android",
+        "version": {
+          "op": "<=",
+          "value": "8.0"
+        }
+      },
       "features": [
         "scalarize_vec_and_mat_constructor_args"
       ]