diff options
| author |  bungeman <bungeman@google.com> | 2016-10-27 09:30:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-27 09:30:08 -0700 |
| commit | 6bd5284415bd983b0628c4941dff5def40018f5a (patch) | |
| tree | 7de7e45431f76db69807204ecdce3ed6fcc4d9e8 /include/ports | |
| parent | 56380524d903f27627a75e2e1189463999725008 (diff) | |
Remove SkAutoTUnref and SkAutoTDelete from public includes.
This also makes the required changed to src, tests, and tools. The few
public APIs modified by this change appear to be unused outside of Skia.
Removing these from the public API makes it easier to ensure users are
no longer using them.
This also updates GrGpu::wrapBackendXXX and the
::onWrapBackendXXX methods to clarify ownership.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2448593002
Review-Url: https://codereview.chromium.org/2448593002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 8 | ||||
| -rw-r--r-- | include/ports/SkTypeface_win.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 406a75a7ee..6c258c851d 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -28,8 +28,8 @@ public: // TODO: The SkFontMgr is only used for createFromStream/File/Data. // In the future these calls should be broken out into their own interface // with a name like SkFontRenderer. - SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy) - : fImpl(SkRef(impl)), fProxy(SkRef(proxy)) + SkFontMgr_Indirect(sk_sp<SkFontMgr> impl, sk_sp<SkRemotableFontMgr> proxy) + : fImpl(std::move(impl)), fProxy(std::move(proxy)) { } protected: @@ -60,8 +60,8 @@ protected: private: SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const; - SkAutoTUnref<SkFontMgr> fImpl; - SkAutoTUnref<SkRemotableFontMgr> fProxy; + sk_sp<SkFontMgr> fImpl; + sk_sp<SkRemotableFontMgr> fProxy; struct DataEntry { uint32_t fDataId; // key1 diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h index 1945b755e7..f3a881f3cc 100644 --- a/include/ports/SkTypeface_win.h +++ b/include/ports/SkTypeface_win.h @@ -57,7 +57,7 @@ SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory, * * If DirectWrite could not be initialized, will return NULL. */ -SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr*); +SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(sk_sp<SkRemotableFontMgr>); /** * Creates an SkRemotableFontMgr backed by DirectWrite using the default |