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

Unified Diff: src/gpu/gl/GrGLContext.h

Issue 1151603005: Revert of Store context options on caps. (Closed) Base URL: https://skia.googlesource.com/skia.git@onecaps
Patch Set: Created 5 years, 7 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 | « src/gpu/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGLContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLContext.h
diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
index 50262cf44a106ca9c6742ae7555fbe2f52002f85..e84c8ecffc265cc0ab651b6a0da2da69f8e3a500 100644
--- a/src/gpu/gl/GrGLContext.h
+++ b/src/gpu/gl/GrGLContext.h
@@ -15,7 +15,7 @@
#include "GrGLSL.h"
#include "GrGLUtil.h"
-struct GrContextOptions;
+#include "SkString.h"
/**
* Encapsulates information about an OpenGL context including the OpenGL
@@ -51,7 +51,6 @@
GrGLRenderer fRenderer;
bool fIsMesa;
bool fIsChromium;
- const GrContextOptions* fContextOptions;
};
GrGLContextInfo(const ConstructorArgs& args);
@@ -75,7 +74,7 @@
* Creates a GrGLContext from a GrGLInterface and the currently
* bound OpenGL context accessible by the GrGLInterface.
*/
- static GrGLContext* Create(const GrGLInterface* interface, const GrContextOptions& options);
+ static GrGLContext* Create(const GrGLInterface* interface);
const GrGLInterface* interface() const { return fInterface; }
« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGLContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698