Revert of Make the Sk GL context class an abstract base class

include/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
 
 #if SK_ANGLE
     #include "gl/SkANGLEGLContext.h"
 #endif
 #include "gl/SkDebugGLContext.h"
 #if SK_MESA
     #include "gl/SkMesaGLContext.h"
 #endif
-#include "gl/SkGLContext.h"
+#include "gl/SkNativeGLContext.h"
 #include "gl/SkNullGLContext.h"
 
 #include "GrContext.h"
 #include "SkTArray.h"
 
 /**
  * This is a simple class that is useful in test apps that use different
  * 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
@@ skipping 94 matching lines @@
         for (int i = 0; i < fContexts.count(); ++i) {
             if (forcedGpuAPI != kNone_GrGLStandard &&
                 forcedGpuAPI != fContexts[i].fGLContext->gl()->fStandard)
                 continue;
 
             if (fContexts[i].fType == type) {
                 fContexts[i].fGLContext->makeCurrent();
                 return fContexts[i].fGrContext;
             }
         }
-        SkAutoTUnref<SkGLContext> glCtx;
+        SkAutoTUnref<SkGLContextHelper> glCtx;
         SkAutoTUnref<GrContext> grCtx;
         switch (type) {
             case kNVPR_GLContextType: // fallthru
             case kNative_GLContextType:
-                glCtx.reset(SkCreatePlatformGLContext());
+                glCtx.reset(SkNEW(SkNativeGLContext));
                 break;
 #ifdef SK_ANGLE
             case kANGLE_GLContextType:
                 glCtx.reset(SkNEW(SkANGLEGLContext));
                 break;
 #endif
 #ifdef SK_MESA
             case kMESA_GLContextType:
                 glCtx.reset(SkNEW(SkMesaGLContext));
                 break;
@@ skipping 36 matching lines @@
         ctx.fGLContext = glCtx.get();
         ctx.fGLContext->ref();
         ctx.fGrContext = grCtx.get();
         ctx.fGrContext->ref();
         ctx.fType = type;
         return ctx.fGrContext;
     }
 
     // Returns the GLContext of the given type. If it has not been created yet,
     // NULL is returned instead.
-    SkGLContext* getGLContext(GLContextType type) {
+    SkGLContextHelper* getGLContext(GLContextType type) {
         for (int i = 0; i < fContexts.count(); ++i) {
             if (fContexts[i].fType == type) {
                 return fContexts[i].fGLContext;
             }
         }
 
         return NULL;
     }
 
     const GrContext::Options& getGlobalOptions() const { return fGlobalOptions; }
 
 private:
     struct GPUContext {
         GLContextType             fType;
-        SkGLContext*              fGLContext;
+        SkGLContextHelper*        fGLContext;
         GrContext*                fGrContext;
     };
     SkTArray<GPUContext, true>    fContexts;
     const GrContext::Options      fGlobalOptions;
 };
 
 #endif