Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: include/gpu/gl/SkMesaGLContext.h

Issue 630843002: Make the Sk GL context class an abstract base class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix android link problem and ios compile problem Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/gl/SkGLContextHelper.h ('k') | include/gpu/gl/SkNativeGLContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/gl/SkMesaGLContext.h
diff --git a/include/gpu/gl/SkMesaGLContext.h b/include/gpu/gl/SkMesaGLContext.h
index 28349ddd8880600ab9f15b5066fbc1e03e6f27b3..ef0017180c699d33dee464c62de35763f1a8433c 100644
--- a/include/gpu/gl/SkMesaGLContext.h
+++ b/include/gpu/gl/SkMesaGLContext.h
@@ -8,11 +8,11 @@
#ifndef SkMesaGLContext_DEFINED
#define SkMesaGLContext_DEFINED
-#include "SkGLContextHelper.h"
+#include "SkGLContext.h"
#if SK_MESA
-class SkMesaGLContext : public SkGLContextHelper {
+class SkMesaGLContext : public SkGLContext {
private:
typedef intptr_t Context;
@@ -24,19 +24,6 @@ public:
virtual void makeCurrent() const SK_OVERRIDE;
virtual void swapBuffers() const SK_OVERRIDE;
- class AutoContextRestore {
- public:
- AutoContextRestore();
- ~AutoContextRestore();
-
- private:
- Context fOldContext;
- GrGLint fOldWidth;
- GrGLint fOldHeight;
- GrGLint fOldFormat;
- void* fOldImage;
- };
-
protected:
virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) SK_OVERRIDE;
virtual void destroyGLContext() SK_OVERRIDE;
« no previous file with comments | « include/gpu/gl/SkGLContextHelper.h ('k') | include/gpu/gl/SkNativeGLContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698