From b4b4cf36c66900fdfaf63106d54a8fac786a3313 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Mon, 4 Apr 2016 05:56:59 -0700 Subject: Revert of Rename enums in GrContextFactory to remove "GL" (patchset #4 id:60001 of https://codereview.chromium.org/1845923004/ ) Reason for revert: Many GM images unexpectedly changed with this CL. Original issue's description: > Rename enums in GrContextFactory to remove "GL" > > Also, remove kNative as a separate context type and instead make it an alias for kGL or kGLES based on OS. > > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1845923004 > > Committed: https://skia.googlesource.com/skia/+/2d9c6f81353597aebf5934547e5cba7a872196fb TBR=egdaniel@google.com,jvanverth@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. Review URL: https://codereview.chromium.org/1856703002 --- bench/nanobench.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bench/nanobench.h') diff --git a/bench/nanobench.h b/bench/nanobench.h index ceab0f6c4f..844811e26d 100644 --- a/bench/nanobench.h +++ b/bench/nanobench.h @@ -29,8 +29,8 @@ struct Config { SkColorProfileType profile; int samples; #if SK_SUPPORT_GPU - sk_gpu_test::GrContextFactory::ContextType ctxType; - sk_gpu_test::GrContextFactory::ContextOptions ctxOptions; + sk_gpu_test::GrContextFactory::GLContextType ctxType; + sk_gpu_test::GrContextFactory::GLContextOptions ctxOptions; bool useDFText; #else int bogusInt; -- cgit v1.2.3