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 --- 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 aec5a30d1a..3a35acf005 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -232,8 +232,8 @@ public: class GPUSink : public Sink { public: - GPUSink(sk_gpu_test::GrContextFactory::ContextType, - sk_gpu_test::GrContextFactory::ContextOptions, + GPUSink(sk_gpu_test::GrContextFactory::GLContextType, + sk_gpu_test::GrContextFactory::GLContextOptions, 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::ContextType fContextType; - sk_gpu_test::GrContextFactory::ContextOptions fContextOptions; + sk_gpu_test::GrContextFactory::GLContextType fContextType; + sk_gpu_test::GrContextFactory::GLContextOptions fContextOptions; int fSampleCount; bool fUseDIText; SkColorType fColorType; -- cgit v1.2.3