Add ContextOptions field to SkCommandLineConfigGpu

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 71 matching lines @@
 
     //! 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
      * to not using GL_NV_path_rendering extension  even when the driver supports it.
      */
-    enum ContextOptions {
-        kNone_ContextOptions                = 0x0,
-        kEnableNVPR_ContextOptions          = 0x1,
-        kUseInstanced_ContextOptions        = 0x2,
-        kRequireSRGBSupport_ContextOptions  = 0x4,
+    enum class ContextOptions {
+        kNone                = 0x0,
+        kEnableNVPR          = 0x1,
+        kUseInstanced        = 0x2,
+        kRequireSRGBSupport  = 0x4,
     };
 
     static ContextType NativeContextTypeForBackend(GrBackend backend) {
         switch (backend) {
             case kOpenGL_GrBackend:
                 return kNativeGL_ContextType;
             case kVulkan_GrBackend:
                 return kVulkan_ContextType;
             default:
                 SkFAIL("Unknown backend");
@@ skipping 49 matching lines @@
     ~GrContextFactory();
 
     void destroyContexts();
     void abandonContexts();
     void releaseResourcesAndAbandonContexts();
 
     /**
      * Get a context initialized with a type of GL context. It also makes the GL context current.
      */
     ContextInfo getContextInfo(ContextType type,
-                               ContextOptions options = kNone_ContextOptions);
+                               ContextOptions options = ContextOptions::kNone);
     /**
      * Get a GrContext initialized with a type of GL context. It also makes the GL context current.
      */
-    GrContext* get(ContextType type, ContextOptions options = kNone_ContextOptions) {
+    GrContext* get(ContextType type, ContextOptions options = ContextOptions::kNone) {
         return this->getContextInfo(type, options).grContext();
     }
     const GrContextOptions& getGlobalOptions() const { return fGlobalOptions; }
 
 private:
     struct Context {
         ContextType     fType;
         ContextOptions  fOptions;
         GrBackend       fBackend;
         TestContext*    fTestContext;
         GrContext*      fGrContext;
         bool            fAbandoned;
     };
     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