From 3e4616ff10fad7ee7dae48f465223b4591ec8ffd Mon Sep 17 00:00:00 2001 From: bsalomon Date: Thu, 31 Mar 2016 10:22:40 -0700 Subject: Revert of rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext (patchset #5 id:80001 of https://codereview.chromium.org/1849463002/ ) Reason for revert: breaking bots Original issue's description: > rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext > > rename subclasses > > Fix up the EGL native GLTestContext > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1849463002 > > TBR=jvanverth@google.com > > Committed: https://skia.googlesource.com/skia/+/4c7f0a16312c374eba4e8d5d46435ce9eb0b9971 TBR=jvanverth@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1850543003 --- tests/Test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/Test.h') diff --git a/tests/Test.h b/tests/Test.h index 7660c44d0d..119976f3ee 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -13,7 +13,7 @@ namespace sk_gpu_test { class GrContextFactory; -class GLTestContext; +class GLContext; } // namespace sk_gpu_test class GrContext; @@ -146,7 +146,7 @@ private: #define GPUTEST_SELECT(a1, a2, N, ...) N #define GPUTEST_CONTEXT_ARGS1(a1) GrContext* a1 -#define GPUTEST_CONTEXT_ARGS2(a1, a2) GrContext* a1, sk_gpu_test::GLTestContext* a2 +#define GPUTEST_CONTEXT_ARGS2(a1, a2) GrContext* a1, sk_gpu_test::GLContext* a2 #define GPUTEST_CONTEXT_ARGS(...) \ GPUTEST_APPLY(GPUTEST_SELECT(__VA_ARGS__, GPUTEST_CONTEXT_ARGS2, GPUTEST_CONTEXT_ARGS1), \ __VA_ARGS__) -- cgit v1.2.3