From 08bf86d1b7b03cc6829f2488d9adcb0502e84b97 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 22 May 2015 12:41:05 -0700 Subject: Revert of Store context options on caps. (patchset #3 id:40001 of https://codereview.chromium.org/1158433006/) Reason for revert: breaking chromeos build (???) Original issue's description: > Store context options on caps. > > Committed: https://skia.googlesource.com/skia/+/f28cff71db2cbb1ff18a8fbf1e80ca761d1f69bc TBR=joshualitt@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1151603005 --- src/gpu/gl/GrGLContext.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/gpu/gl/GrGLContext.h') diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h index 50262cf44a..e84c8ecffc 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 @@ protected: GrGLRenderer fRenderer; bool fIsMesa; bool fIsChromium; - const GrContextOptions* fContextOptions; }; GrGLContextInfo(const ConstructorArgs& args); @@ -75,7 +74,7 @@ public: * 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; } -- cgit v1.2.3