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 --- dm/DMSrcSink.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index c4df845853..743bd1e467 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -232,8 +232,8 @@ public: class GPUSink : public Sink { public: - GPUSink(sk_gpu_test::GrContextFactory::GLContextType, - sk_gpu_test::GrContextFactory::GLContextOptions, + GPUSink(sk_gpu_test::GrContextFactory::ContextType, + sk_gpu_test::GrContextFactory::ContextOptions, int samples, bool diText, SkColorType colorType, SkColorProfileType profileType, bool threaded); @@ -242,8 +242,8 @@ public: const char* fileExtension() const override { return "png"; } SinkFlags flags() const override { return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect }; } private: - sk_gpu_test::GrContextFactory::GLContextType fContextType; - sk_gpu_test::GrContextFactory::GLContextOptions fContextOptions; + sk_gpu_test::GrContextFactory::ContextType fContextType; + sk_gpu_test::GrContextFactory::ContextOptions fContextOptions; int fSampleCount; bool fUseDIText; SkColorType fColorType; -- cgit v1.2.3