Revert of Make SkGLContext lifetime more well-defined

include/gpu/gl/SkGLContext.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkGLContext_DEFINED
 #define SkGLContext_DEFINED
 
 #include "GrGLInterface.h"
 #include "../private/SkGpuFenceSync.h"
 
 /**
  * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO.
  * Provides a GrGLInterface struct of function pointers for the context.
  * This class is intended for Skia's testing needs and not for general
  * use.
  */
-class SK_API SkGLContext : public SkNoncopyable {
+class SK_API SkGLContext : public SkRefCnt {
 public:
-    virtual ~SkGLContext();
+    ~SkGLContext() override;
 
     bool isValid() const { return NULL != gl(); }
 
     const GrGLInterface* gl() const { return fGL.get(); }
 
     bool fenceSyncSupport() const { return SkToBool(fFenceSync); }
 
     bool getMaxGpuFrameLag(int* maxFrameLag) const {
         if (!fFenceSync) {
             return false;
@@ skipping 66 matching lines @@
 
     SkAutoTDelete<SkGpuFenceSync> fFenceSync;
     SkPlatformGpuFence            fFrameFences[kMaxFrameLag - 1];
     int                           fCurrentFenceIdx;
 
     /** Subclass provides the gl interface object if construction was
      *  successful. */
     SkAutoTUnref<const GrGLInterface> fGL;
 
     friend class GLFenceSync;  // For onPlatformGetProcAddress.
+
+    typedef SkRefCnt INHERITED;
 };
 
 /** Creates platform-dependent GL context object
  * Returns a valid gl context object or NULL if such can not be created.
  * Note: If Skia embedder needs a custom GL context that sets up the GL
  * interface, this function should be implemented by the embedder.
  * Otherwise, the default implementation for the platform should be compiled in
  * the library.
  */
 SK_API SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI);
 
 /**
  * Helper macros for using the GL context through the GrGLInterface. Example:
  * SK_GL(glCtx, GenTextures(1, &texID));
  */
 #define SK_GL(ctx, X) (ctx).gl()->fFunctions.f ## X;    \
                       SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
 #define SK_GL_RET(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X;    \
                   SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
 #define SK_GL_NOERRCHECK(ctx, X) (ctx).gl()->fFunctions.f ## X
 #define SK_GL_RET_NOERRCHECK(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X
 
 #endif