Revert of Implement support for using GL ES 3.0 with command buffer

src/gpu/GrContextFactory.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContextFactory.h"
 
@@ skipping 77 matching lines @@
 #ifdef SK_BUILD_FOR_WIN
         case kANGLE_GLContextType:
             glCtx.reset(SkANGLEGLContext::CreateDirectX());
             break;
 #endif
         case kANGLE_GL_GLContextType:
             glCtx.reset(SkANGLEGLContext::CreateOpenGL());
             break;
 #endif
 #if SK_COMMAND_BUFFER
-        case kCommandBufferES2_GLContextType:
-            glCtx.reset(SkCommandBufferGLContext::CreateES2());
-            break;
-        case kCommandBufferES3_GLContextType:
-            glCtx.reset(SkCommandBufferGLContext::CreateES3());
+        case kCommandBuffer_GLContextType:
+            glCtx.reset(SkCommandBufferGLContext::Create());
             break;
 #endif
 #if SK_MESA
         case kMESA_GLContextType:
             glCtx.reset(SkMesaGLContext::Create());
             break;
 #endif
         case kNull_GLContextType:
             glCtx.reset(SkNullGLContext::Create());
             break;
@@ skipping 32 matching lines @@
         }
     }
 
     Context& context = fContexts.push_back();
     context.fGLContext = glCtx.detach();
     context.fGrContext = SkRef(grCtx.get());
     context.fType = type;
     context.fOptions = options;
     return ContextInfo(context.fGrContext, context.fGLContext);
 }