Improve check for skia-renderer-gl tag

SkiaRenderer will use GL by default if not using Vulkan or Dawn. The
--use-gl switch isn't required to get into this state. Add a check that
we're using GPU compositing first, since if that is false Chrome will
use SoftwareRenderer. Also change the skia-renderer-gl tag to be true if
'opengl' feature is enabled but not using Vulkan or Dawn.

Bug: 1163586
Change-Id: Ica5ee59d59b8e437faf0aa9c954e3280d1c7d0e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622237Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842983}

content/test/gpu/gpu_tests/gpu_helper.py

@@ -142,14 +142,17 @@ def GetSkiaRenderer(gpu_feature_status, extra_browser_args):
   retval = 'skia-renderer-disabled'
   skia_renderer_enabled = (
       gpu_feature_status
-      and gpu_feature_status.get('skia_renderer') == 'enabled_on')
+      and gpu_feature_status.get('skia_renderer') == 'enabled_on'
+      and gpu_feature_status.get('gpu_compositing') == 'enabled')
   if skia_renderer_enabled:
     if HasDawnSkiaRenderer(extra_browser_args):
       retval = 'skia-renderer-dawn'
-    elif HasGlSkiaRenderer(extra_browser_args):
-      retval = 'skia-renderer-gl'
     elif HasVulkanSkiaRenderer(gpu_feature_status):
       retval = 'skia-renderer-vulkan'
+    # The check for GL must come after Vulkan since the 'opengl' feature can be
+    # enabled for WebGL and interop even if SkiaRenderer is using Vulkan.
+    elif HasGlSkiaRenderer(gpu_feature_status):
+      retval = 'skia-renderer-gl'
   return retval
 
 
@@ -162,12 +165,8 @@ def HasDawnSkiaRenderer(extra_browser_args):
   return False
 
 
-def HasGlSkiaRenderer(extra_browser_args):
-  if extra_browser_args:
-    for arg in extra_browser_args:
-      if '--use-gl=' in arg:
-        return True
-  return False
+def HasGlSkiaRenderer(gpu_feature_status):
+  return gpu_feature_status and gpu_feature_status.get('opengl') == 'enabled_on'
 
 
 def HasVulkanSkiaRenderer(gpu_feature_status):