Revert of Explicit control in tools of ANGLE frontend and backend

tools/gpu/GrContextFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContextFactory_DEFINED
 #define GrContextFactory_DEFINED
 
@@ skipping 50 matching lines @@
  * GrContexts backed by different types of GL contexts. It manages creating the
  * GL context and a GrContext that uses it. The GL/Gr contexts persist until the
  * factory is destroyed (though the caller can always grab a ref on the returned
  * Gr and GL contexts to make them outlive the factory).
  */
 class GrContextFactory : SkNoncopyable {
 public:
     // The availability of context types is subject to platform and build configuration
     // restrictions.
     enum ContextType {
-        kGL_ContextType,             //! OpenGL context.
-        kGLES_ContextType,           //! OpenGL ES context.
-        kANGLE_D3D9_ES2_ContextType, //! ANGLE on Direct3D9 OpenGL ES 2 context.
-        kANGLE_D3D11_ES2_ContextType,//! ANGLE on Direct3D11 OpenGL ES 2 context.
-        kANGLE_D3D11_ES3_ContextType,//! ANGLE on Direct3D11 OpenGL ES 3 context.
-        kANGLE_GL_ES2_ContextType,   //! ANGLE on OpenGL OpenGL ES 2 context.
-        kANGLE_GL_ES3_ContextType,   //! ANGLE on OpenGL OpenGL ES 3 context.
-        kCommandBuffer_ContextType,  //! Chromium command buffer OpenGL ES context.
-        kMESA_ContextType,           //! MESA OpenGL context
-        kNullGL_ContextType,         //! Non-rendering OpenGL mock context.
-        kDebugGL_ContextType,        //! Non-rendering, state verifying OpenGL context.
-        kVulkan_ContextType,         //! Vulkan
+        kGL_ContextType,            //! OpenGL context.
+        kGLES_ContextType,          //! OpenGL ES context.
+        kANGLE_ContextType,         //! ANGLE on DirectX OpenGL ES context.
+        kANGLE_GL_ContextType,      //! ANGLE on OpenGL OpenGL ES context.
+        kCommandBuffer_ContextType, //! Chromium command buffer OpenGL ES context.
+        kMESA_ContextType,          //! MESA OpenGL context
+        kNullGL_ContextType,        //! Non-rendering OpenGL mock context.
+        kDebugGL_ContextType,       //! Non-rendering, state verifying OpenGL context.
+        kVulkan_ContextType,        //! Vulkan
         kLastContextType = kVulkan_ContextType
     };
 
     //! OpenGL or OpenGL ES context depending on the platform. To be removed.
     static const ContextType kNativeGL_ContextType;
 
     static const int kContextTypeCnt = kLastContextType + 1;
 
     /**
      * Options for GL context creation. For historical and testing reasons the options will default
@@ skipping 30 matching lines @@
 
     static GrBackend ContextTypeBackend(ContextType type) {
         switch (type) {
             case kVulkan_ContextType:
                 return kVulkan_GrBackend;
             default:
                 return kOpenGL_GrBackend;
         }
     }
 
+    static const char* ContextTypeName(ContextType type) {
+        switch (type) {
+            case kGL_ContextType:
+                return "gl";
+            case kGLES_ContextType:
+                return "gles";
+            case kANGLE_ContextType:
+                return "angle";
+            case kANGLE_GL_ContextType:
+                return "angle-gl";
+            case kCommandBuffer_ContextType:
+                return "commandbuffer";
+            case kMESA_ContextType:
+                return "mesa";
+            case kNullGL_ContextType:
+                return "nullgl";
+            case kDebugGL_ContextType:
+                return "debuggl";
+            case kVulkan_ContextType:
+                return "vulkan";
+        }
+    }
+
     explicit GrContextFactory(const GrContextOptions& opts);
     GrContextFactory();
 
     ~GrContextFactory();
 
     void destroyContexts();
     void abandonContexts();
     void releaseResourcesAndAbandonContexts();
 
     /**
@@ skipping 20 matching lines @@
     };
     SkTArray<Context, true>         fContexts;
     SkAutoTDelete<GLTestContext>    fSentinelGLContext;
     const GrContextOptions          fGlobalOptions;
 };
 }  // namespace sk_gpu_test
 
 GR_MAKE_BITFIELD_CLASS_OPS(sk_gpu_test::GrContextFactory::ContextOptions);
 
 #endif