aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/gpu/GrContextFactory.h
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-03-31 10:59:06 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-31 10:59:06 -0700
commit273c0f5e87397c40d22bb7e3ee078bb46a3f6860 (patch)
tree70436fd146c39be9702c6c295a8fd204a38d865f /tools/gpu/GrContextFactory.h
parenta5598a40f82d69113fb4764dcb8de62151921807 (diff)
rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
Diffstat (limited to 'tools/gpu/GrContextFactory.h')
-rw-r--r--tools/gpu/GrContextFactory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h
index b17460819d..14a2739815 100644
--- a/tools/gpu/GrContextFactory.h
+++ b/tools/gpu/GrContextFactory.h
@@ -11,7 +11,7 @@
#include "GrContext.h"
#include "GrContextOptions.h"
-#include "gl/GLContext.h"
+#include "gl/GLTestContext.h"
#include "SkTArray.h"
namespace sk_gpu_test {
@@ -111,10 +111,10 @@ public:
struct ContextInfo {
ContextInfo()
: fGrContext(nullptr), fGLContext(nullptr) { }
- ContextInfo(GrContext* grContext, GLContext* glContext)
+ ContextInfo(GrContext* grContext, GLTestContext* glContext)
: fGrContext(grContext), fGLContext(glContext) { }
GrContext* fGrContext;
- GLContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
+ GLTestContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
//! destroyContexts().
};
@@ -136,7 +136,7 @@ private:
struct Context {
GLContextType fType;
GLContextOptions fOptions;
- GLContext* fGLContext;
+ GLTestContext* fGLContext;
GrContext* fGrContext;
};
SkTArray<Context, true> fContexts;