From 6a61a875467646f8dbc37cfecf49e12d1f475170 Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 16 Jun 2016 11:10:03 -0700 Subject: Lots of progress on switching to SkColorSpace rather than SkColorProfileType Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 Review-Url: https://codereview.chromium.org/2069173002 --- dm/DMSrcSink.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 8cb2b25bf4..a2bfbca7f3 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -281,7 +281,7 @@ class GPUSink : public Sink { public: GPUSink(sk_gpu_test::GrContextFactory::ContextType, sk_gpu_test::GrContextFactory::ContextOptions, - int samples, bool diText, SkColorType colorType, SkColorProfileType profileType, + int samples, bool diText, SkColorType colorType, sk_sp colorSpace, bool threaded); Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; @@ -294,7 +294,7 @@ private: int fSampleCount; bool fUseDIText; SkColorType fColorType; - SkColorProfileType fProfileType; + sk_sp fColorSpace; bool fThreaded; }; @@ -318,14 +318,14 @@ public: class RasterSink : public Sink { public: - explicit RasterSink(SkColorType, SkColorProfileType=kLinear_SkColorProfileType); + explicit RasterSink(SkColorType, sk_sp = nullptr); Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; const char* fileExtension() const override { return "png"; } SinkFlags flags() const override { return SinkFlags{ SinkFlags::kRaster, SinkFlags::kDirect }; } private: - SkColorType fColorType; - SkColorProfileType fProfileType; + SkColorType fColorType; + sk_sp fColorSpace; }; class SKPSink : public Sink { -- cgit v1.2.3