diff options
| author |  msarett <msarett@google.com> | 2016-03-07 07:09:03 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-07 07:09:03 -0800 |
| commit | ad8bcfeac4a684a64db3a7447aeea5bc35155f16 (patch) | |
| tree | c992c61ea818a99b03acfa8ded141cb03e66df08 /include/codec | |
| parent | eaf086e3ce1b8351a8cd01762ca5144254bddbc4 (diff) | |
Use a smart pointer for SkColorSpace factories
This should fix master-skia in Android because we no longer need
to include src/core for SkCodec.h.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1766413002
Review URL: https://codereview.chromium.org/1766413002
Diffstat (limited to 'include/codec')
| -rw-r--r-- | include/codec/SkCodec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index 78295eb1fc..7e7503acae 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -10,13 +10,13 @@ #include "../private/SkTemplates.h" #include "SkColor.h" -#include "SkColorSpace.h" #include "SkEncodedFormat.h" #include "SkImageInfo.h" #include "SkSize.h" #include "SkStream.h" #include "SkTypes.h" +class SkColorSpace; class SkData; class SkPngChunkReader; class SkSampler; @@ -104,7 +104,7 @@ public: * Does not affect ownership. * Might be NULL. */ - SkColorSpace* getColorSpace() const { return fColorSpace; } + SkColorSpace* getColorSpace() const { return fColorSpace.get(); } /** * Return a size that approximately supports the desired scale factor. @@ -514,7 +514,7 @@ protected: * Takes ownership of SkStream* * Does not affect ownership of SkColorSpace* */ - SkCodec(const SkImageInfo&, SkStream*, SkColorSpace* = nullptr); + SkCodec(const SkImageInfo&, SkStream*, sk_sp<SkColorSpace> = nullptr); virtual SkISize onGetScaledDimensions(float /*desiredScale*/) const { // By default, scaling is not supported. @@ -645,7 +645,7 @@ private: const SkImageInfo fSrcInfo; SkAutoTDelete<SkStream> fStream; bool fNeedsRewind; - SkAutoTUnref<SkColorSpace> fColorSpace; + sk_sp<SkColorSpace> fColorSpace; // These fields are only meaningful during scanline decodes. SkImageInfo fDstInfo; |