| Index: tools/gpu/GrContextFactory.h
|
| diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h
|
| index 14a2739815b4c1061577e412f131f68264d5f730..b17460819d9968ea6434972608fbf0fa7267a5ab 100644
|
| --- a/tools/gpu/GrContextFactory.h
|
| +++ b/tools/gpu/GrContextFactory.h
|
| @@ -11,7 +11,7 @@
|
| #include "GrContext.h"
|
| #include "GrContextOptions.h"
|
|
|
| -#include "gl/GLTestContext.h"
|
| +#include "gl/GLContext.h"
|
| #include "SkTArray.h"
|
|
|
| namespace sk_gpu_test {
|
| @@ -111,10 +111,10 @@
|
| struct ContextInfo {
|
| ContextInfo()
|
| : fGrContext(nullptr), fGLContext(nullptr) { }
|
| - ContextInfo(GrContext* grContext, GLTestContext* glContext)
|
| + ContextInfo(GrContext* grContext, GLContext* glContext)
|
| : fGrContext(grContext), fGLContext(glContext) { }
|
| GrContext* fGrContext;
|
| - GLTestContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
|
| + GLContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
|
| //! destroyContexts().
|
| };
|
|
|
| @@ -136,7 +136,7 @@
|
| struct Context {
|
| GLContextType fType;
|
| GLContextOptions fOptions;
|
| - GLTestContext* fGLContext;
|
| + GLContext* fGLContext;
|
| GrContext* fGrContext;
|
| };
|
| SkTArray<Context, true> fContexts;
|
|
|