From e812d496aaa5e5e9f2117de8f442c297c9cb1367 Mon Sep 17 00:00:00 2001 From: csmartdalton Date: Tue, 21 Feb 2017 12:36:05 -0700 Subject: Rename GrContextFactory::ContextOptions to ContextOverrides Also changes the behavior of these flags to only override their corresponding context options when set, and to leave them unchanged when not set. BUG=skia: Change-Id: I09f6be09997594fa888d9045dd4901354ef3f880 Reviewed-on: https://skia-review.googlesource.com/8780 Reviewed-by: Brian Salomon Commit-Queue: Chris Dalton --- dm/DMSrcSink.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 9c6808ecd6..92c5773d36 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -303,7 +303,7 @@ public: class GPUSink : public Sink { public: GPUSink(sk_gpu_test::GrContextFactory::ContextType, - sk_gpu_test::GrContextFactory::ContextOptions, + sk_gpu_test::GrContextFactory::ContextOverrides, int samples, bool diText, SkColorType colorType, sk_sp colorSpace, bool threaded); @@ -312,13 +312,13 @@ 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; - int fSampleCount; - bool fUseDIText; - SkColorType fColorType; - sk_sp fColorSpace; - bool fThreaded; + sk_gpu_test::GrContextFactory::ContextType fContextType; + sk_gpu_test::GrContextFactory::ContextOverrides fContextOverrides; + int fSampleCount; + bool fUseDIText; + SkColorType fColorType; + sk_sp fColorSpace; + bool fThreaded; }; class PDFSink : public Sink { -- cgit v1.2.3