| Index: dm/DM.cpp
|
| diff --git a/dm/DM.cpp b/dm/DM.cpp
|
| index 79b9e8d62bc32d3740c114f38543d9d9ac15995c..07e594b25d9f09f5575ad21837f51953a7d8a4a5 100644
|
| --- a/dm/DM.cpp
|
| +++ b/dm/DM.cpp
|
| @@ -71,7 +71,7 @@ DEFINE_bool(simpleCodec, false, "Only decode images to native scale");
|
|
|
| using namespace DM;
|
| using sk_gpu_test::GrContextFactory;
|
| -using sk_gpu_test::GLContext;
|
| +using sk_gpu_test::GLTestContext;
|
|
|
| /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
|
|
|
| @@ -1418,7 +1418,7 @@ int dm_main() {
|
| namespace skiatest {
|
| namespace {
|
| typedef void(*TestWithGrContext)(skiatest::Reporter*, GrContext*);
|
| -typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLContext*);
|
| +typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLTestContext*);
|
| #if SK_SUPPORT_GPU
|
| template<typename T>
|
| void call_test(T test, skiatest::Reporter* reporter, const GrContextFactory::ContextInfo& context);
|
|
|