diff options
| author |  brianosman <brianosman@google.com> | 2016-06-16 11:41:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-16 11:41:44 -0700 |
| commit | ab8241880d09eb1774b4993ca6df048a27b7020c (patch) | |
| tree | f3c7e4c1873771ee818e0a1c86515a3ea5250d75 /dm/DMSrcSink.h | |
| parent | 6a61a875467646f8dbc37cfecf49e12d1f475170 (diff) | |
Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType (patchset #10 id:180001 of https://codereview.chromium.org/2069173002/ )
Reason for revert:
Mac crashes in GrUploadPixmapToTexture
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170
TBR=reed@google.com,herb@google.com,msarett@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/2072813002
Diffstat (limited to 'dm/DMSrcSink.h')
| -rw-r--r-- | dm/DMSrcSink.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index a2bfbca7f3..8cb2b25bf4 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, sk_sp<SkColorSpace> colorSpace, + int samples, bool diText, SkColorType colorType, SkColorProfileType profileType, bool threaded); Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; @@ -294,7 +294,7 @@ private: int fSampleCount; bool fUseDIText; SkColorType fColorType; - sk_sp<SkColorSpace> fColorSpace; + SkColorProfileType fProfileType; bool fThreaded; }; @@ -318,14 +318,14 @@ public: class RasterSink : public Sink { public: - explicit RasterSink(SkColorType, sk_sp<SkColorSpace> = nullptr); + explicit RasterSink(SkColorType, SkColorProfileType=kLinear_SkColorProfileType); 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; - sk_sp<SkColorSpace> fColorSpace; + SkColorType fColorType; + SkColorProfileType fProfileType; }; class SKPSink : public Sink { |