diff options
author | 2014-07-15 13:29:34 -0700 | |
---|---|---|
committer | 2014-07-15 13:29:34 -0700 | |
commit | a179a1ede9e8ff17e23a61a55d822e862d09b8e8 (patch) | |
tree | 1442e816364a0f77f958b02b18bd6a1f2b5b9257 | |
parent | 18515cf3702131ccc100de8d61a0490f595cf0df (diff) |
SkAutoRef seems lonely. Might as well delete it.
(On the other hand, SkAutoUnref is well-used.)
NOTREECHECKS=true
BUG=skia:
R=bungeman@google.com, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/393953004
-rw-r--r-- | include/core/SkRefCnt.h | 9 | ||||
-rw-r--r-- | src/gpu/GrTextStrike.cpp | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index 1724c77d8d..9e3a92eb9a 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -248,15 +248,6 @@ public: }; #define SkAutoUnref(...) SK_REQUIRE_LOCAL_VAR(SkAutoUnref) -class SkAutoRef : SkNoncopyable { -public: - SkAutoRef(SkRefCnt* obj) : fObj(obj) { SkSafeRef(obj); } - ~SkAutoRef() { SkSafeUnref(fObj); } -private: - SkRefCnt* fObj; -}; -#define SkAutoRef(...) SK_REQUIRE_LOCAL_VAR(SkAutoRef) - /** Wrapper class for SkRefCnt pointers. This manages ref/unref of a pointer to a SkRefCnt (or subclass) object. */ diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp index 4079893b3a..46d7a537ce 100644 --- a/src/gpu/GrTextStrike.cpp +++ b/src/gpu/GrTextStrike.cpp @@ -293,7 +293,7 @@ bool GrTextStrike::addGlyphToAtlas(GrGlyph* glyph, GrFontScaler* scaler) { SkASSERT(fCache.contains(glyph)); SkASSERT(NULL == glyph->fPlot); - SkAutoRef ar(scaler); + SkAutoUnref ar(SkSafeRef(scaler)); int bytesPerPixel = GrMaskFormatBytesPerPixel(fMaskFormat); |