diff options
| author |  bsalomon <bsalomon@google.com> | 2016-03-31 10:22:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-31 10:22:40 -0700 |
| commit | 3e4616ff10fad7ee7dae48f465223b4591ec8ffd (patch) | |
| tree | df01f28a98905063005845649a6cff2ea417c626 /dm | |
| parent | 062bd860338dbaa8cae38486a338ea97435aed92 (diff) | |
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
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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::GLTestContext; +using sk_gpu_test::GLContext; /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ @@ -1418,7 +1418,7 @@ int dm_main() { namespace skiatest { namespace { typedef void(*TestWithGrContext)(skiatest::Reporter*, GrContext*); -typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLTestContext*); +typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLContext*); #if SK_SUPPORT_GPU template<typename T> void call_test(T test, skiatest::Reporter* reporter, const GrContextFactory::ContextInfo& context); |