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

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

Issue 1814113002: Store null GL context's state in interface object (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add overrides Created 4 years, 9 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/GrGLFunctions.h ('k') | src/gpu/gl/GrGLCreateNullInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/gl/SkNullGLContext.h
diff --git a/include/gpu/gl/SkNullGLContext.h b/include/gpu/gl/SkNullGLContext.h
index 9e799a9fea4d9d7b9b832026f4c664aee7a797ec..5a2a73fd8f54d73dbdbb8e25beda5a5becf04221 100644
--- a/include/gpu/gl/SkNullGLContext.h
+++ b/include/gpu/gl/SkNullGLContext.h
@@ -13,24 +13,14 @@
class SK_API SkNullGLContext : public SkGLContext {
public:
~SkNullGLContext() override;
-
static SkNullGLContext* Create();
- // FIXME: remove once Chromium has been updated.
- static SkNullGLContext* Create(GrGLStandard forcedAPI) {
- SkASSERT(forcedAPI == kNone_GrGLStandard);
- (void)forcedAPI; return Create();
- }
-
- class ContextState;
private:
SkNullGLContext();
- void onPlatformMakeCurrent() const override;
+ void onPlatformMakeCurrent() const override {};
void onPlatformSwapBuffers() const override {}
- GrGLFuncPtr onPlatformGetProcAddress(const char*) const override { return NULL; }
-
- ContextState* fState;
+ GrGLFuncPtr onPlatformGetProcAddress(const char*) const override { return nullptr; }
};
#endif
« no previous file with comments | « include/gpu/gl/GrGLFunctions.h ('k') | src/gpu/gl/GrGLCreateNullInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698