| Index: src/ports/SkFontMgr_win_dw.cpp
 | 
| diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp
 | 
| index 7201dc10b03b8380d2ccdb14a6ce95a43e9dad44..33ae767ec328bd69781babefb74985ee3a949e2a 100644
 | 
| --- a/src/ports/SkFontMgr_win_dw.cpp
 | 
| +++ b/src/ports/SkFontMgr_win_dw.cpp
 | 
| @@ -1085,11 +1085,11 @@ SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory,
 | 
|  }
 | 
|  
 | 
|  #include "SkFontMgr_indirect.h"
 | 
| -SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) {
 | 
| -    SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite());
 | 
| -    if (impl.get() == nullptr) {
 | 
| +SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(sk_sp<SkRemotableFontMgr> proxy) {
 | 
| +    sk_sp<SkFontMgr> impl(SkFontMgr_New_DirectWrite());
 | 
| +    if (!impl) {
 | 
|          return nullptr;
 | 
|      }
 | 
| -    return new SkFontMgr_Indirect(impl.get(), proxy);
 | 
| +    return new SkFontMgr_Indirect(std::move(impl), std::move(proxy));
 | 
|  }
 | 
|  #endif//defined(SK_BUILD_FOR_WIN32)
 | 
| 
 |