From 6f70d43719d0583d486a000f66e915c10a6b83a2 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 30 Mar 2016 09:26:24 -0700 Subject: Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module (patchset #13 id:240001 of https://codereview.chromium.org/1815823002/ ) Reason for revert: red bots Original issue's description: > Move SkGLContext and some GrGLInterface implementations to skgputest module > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1815823002 > CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot > > Committed: https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58 TBR=jvanverth@google.com,bsalomon@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1845473004 --- dm/DMSrcSink.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 3a35acf005..1a56e817ca 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -232,8 +232,7 @@ public: class GPUSink : public Sink { public: - GPUSink(sk_gpu_test::GrContextFactory::GLContextType, - sk_gpu_test::GrContextFactory::GLContextOptions, + GPUSink(GrContextFactory::GLContextType, GrContextFactory::GLContextOptions, int samples, bool diText, SkColorType colorType, SkColorProfileType profileType, bool threaded); @@ -242,13 +241,13 @@ 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; - int fSampleCount; - bool fUseDIText; - SkColorType fColorType; - SkColorProfileType fProfileType; - bool fThreaded; + GrContextFactory::GLContextType fContextType; + GrContextFactory::GLContextOptions fContextOptions; + int fSampleCount; + bool fUseDIText; + SkColorType fColorType; + SkColorProfileType fProfileType; + bool fThreaded; }; class PDFSink : public Sink { -- cgit v1.2.3