From 85b4b53e78dcdeae2a51935ca5e214b0f1a06492 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 5 Apr 2016 11:06:27 -0700 Subject: 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 Review URL: https://codereview.chromium.org/1845923004 --- 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 844811e26d..ceab0f6c4f 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::GLContextType ctxType; - sk_gpu_test::GrContextFactory::GLContextOptions ctxOptions; + sk_gpu_test::GrContextFactory::ContextType ctxType; + sk_gpu_test::GrContextFactory::ContextOptions ctxOptions; bool useDFText; #else int bogusInt; -- cgit v1.2.3