aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
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 /dm
parenta5598a40f82d69113fb4764dcb8de62151921807 (diff)
rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 79b9e8d62b..07e594b25d 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);