| Index: src/gpu/gl/GrGLContext.h
|
| diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
|
| index 8207ac89b0092d0b7ed3d392bf31f3ef29f73f33..6016f6859a35e5cbfd9213dd043d6b85813e7f2d 100644
|
| --- a/src/gpu/gl/GrGLContext.h
|
| +++ b/src/gpu/gl/GrGLContext.h
|
| @@ -15,9 +15,6 @@
|
| #include "GrGLUtil.h"
|
|
|
| struct GrContextOptions;
|
| -namespace SkSL {
|
| - class Compiler;
|
| -}
|
|
|
| /**
|
| * Encapsulates information about an OpenGL context including the OpenGL
|
| @@ -41,8 +38,6 @@
|
| }
|
|
|
| const GrGLExtensions& extensions() const { return fInterface->fExtensions; }
|
| -
|
| - virtual ~GrGLContextInfo() {}
|
|
|
| protected:
|
| struct ConstructorArgs {
|
| @@ -69,7 +64,7 @@
|
| };
|
|
|
| /**
|
| - * Extension of GrGLContextInfo that also provides access to GrGLInterface and SkSL::Compiler.
|
| + * Extension of GrGLContextInfo that also provides access to GrGLInterface.
|
| */
|
| class GrGLContext : public GrGLContextInfo {
|
| public:
|
| @@ -81,16 +76,8 @@
|
|
|
| const GrGLInterface* interface() const { return fInterface; }
|
|
|
| - SkSL::Compiler* compiler() const;
|
| -
|
| - ~GrGLContext() override;
|
| -
|
| private:
|
| - GrGLContext(const ConstructorArgs& args)
|
| - : INHERITED(args)
|
| - , fCompiler(nullptr) {}
|
| -
|
| - mutable SkSL::Compiler* fCompiler;
|
| + GrGLContext(const ConstructorArgs& args) : INHERITED(args) {}
|
|
|
| typedef GrGLContextInfo INHERITED;
|
| };
|
|
|