Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / include / gpu / gl / SkNullGLContext.h

diff --git a/src/third_party/skia/include/gpu/gl/SkNullGLContext.h b/src/third_party/skia/include/gpu/gl/SkNullGLContext.h
index 02d968e..35e94d2 100644 (file)
--- a/src/third_party/skia/include/gpu/gl/SkNullGLContext.h
+++ b/src/third_party/skia/include/gpu/gl/SkNullGLContext.h
@@ -8,21 +8,28 @@
 #ifndef SkNullGLContext_DEFINED
 #define SkNullGLContext_DEFINED
 
-#include "SkGLContextHelper.h"
-
-class SK_API SkNullGLContext : public SkGLContextHelper {
+#include "SkGLContext.h"
 
+class SK_API SkNullGLContext : public SkGLContext {
 public:
-    SkNullGLContext() {};
-
+    virtual ~SkNullGLContext() SK_OVERRIDE;
     virtual void makeCurrent() const SK_OVERRIDE {};
-
     virtual void swapBuffers() const SK_OVERRIDE {};
 
-protected:
-    virtual const GrGLInterface* createGLContext() SK_OVERRIDE;
-
-    virtual void destroyGLContext() SK_OVERRIDE {};
+    static SkNullGLContext* Create(GrGLStandard forcedGpuAPI) {
+        if (kGLES_GrGLStandard == forcedGpuAPI) {
+            return NULL;
+        }
+        SkNullGLContext* ctx = SkNEW(SkNullGLContext);
+        if (!ctx->isValid()) {
+            SkDELETE(ctx);
+            return NULL;
+        }
+        return ctx;
+    }
+
+private:
+    SkNullGLContext();
 };
 
 #endif