commit 67b39de70fb5d10caebfc75f418754186e5226c3
author Hal Canary <halcanary@google.com> Mon Nov 07 11:47:44 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 07 17:22:19 2016 +0000
tree 53a773248fb4dbc02bdf71c89e9619398c5f2f95
parent 09c85a53c370325d4e8646e34be7684728a1f375

s/SkAutoTUnref/sk_sp/ in src/ part 1

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4480

Change-Id: I7d3219b02ad5094785e1b7635a9482e69aadbc8c
Reviewed-on: https://skia-review.googlesource.com/4480
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

src/codec/SkBmpStandardCodec.h

diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h
index 12c12e8..61b2792 100644
--- a/src/codec/SkBmpStandardCodec.h
+++ b/src/codec/SkBmpStandardCodec.h
@@ -84,17 +84,17 @@
      */
     void decodeIcoMask(SkStream* stream, const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
 
-    SkAutoTUnref<SkColorTable>          fColorTable;     // owned
+    sk_sp<SkColorTable>         fColorTable;
     // fNumColors is the number specified in the header, or 0 if not present in the header.
-    const uint32_t                      fNumColors;
-    const uint32_t                      fBytesPerColor;
-    const uint32_t                      fOffset;
-    std::unique_ptr<SkSwizzler>         fSwizzler;
-    std::unique_ptr<uint8_t[]>          fSrcBuffer;
-    const bool                          fIsOpaque;
-    const bool                          fInIco;
-    const size_t                        fAndMaskRowBytes; // only used for fInIco decodes
-    bool                                fXformOnDecode;
+    const uint32_t              fNumColors;
+    const uint32_t              fBytesPerColor;
+    const uint32_t              fOffset;
+    std::unique_ptr<SkSwizzler> fSwizzler;
+    std::unique_ptr<uint8_t[]>  fSrcBuffer;
+    const bool                  fIsOpaque;
+    const bool                  fInIco;
+    const size_t                fAndMaskRowBytes; // only used for fInIco decodes
+    bool                        fXformOnDecode;
 
     typedef SkBmpCodec INHERITED;
 };