Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>.

third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 27 matching lines @@
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFaceCreationParams.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/win/FontFallbackWin.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
-HashMap<String, RefPtr<SkTypeface>>* FontCache::s_sideloadedFonts = 0;
+HashMap<String, sk_sp<SkTypeface>>* FontCache::s_sideloadedFonts = 0;
 
 // Cached system font metrics.
 AtomicString* FontCache::s_menuFontFamilyName = 0;
 int32_t FontCache::s_menuFontHeight = 0;
 AtomicString* FontCache::s_smallCaptionFontFamilyName = 0;
 int32_t FontCache::s_smallCaptionFontHeight = 0;
 AtomicString* FontCache::s_statusFontFamilyName = 0;
 int32_t FontCache::s_statusFontHeight = 0;
 
 namespace {
 
 int32_t ensureMinimumFontHeightIfNeeded(int32_t fontHeight)
 {
     // Adjustment for codepage 936 to make the fonts more legible in Simplified Chinese.
     // Please refer to LayoutThemeFontProviderWin.cpp for more information.
     return (fontHeight < 12.0f) && (GetACP() == 936) ? 12.0f : fontHeight;
 }
 
 } // namespace
 
 // static
 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface)
 {
     if (!s_sideloadedFonts)
-        s_sideloadedFonts = new HashMap<String, RefPtr<SkTypeface>>;
+        s_sideloadedFonts = new HashMap<String, sk_sp<SkTypeface>>;
     SkString name;
     typeface->getFamilyName(&name);
-    s_sideloadedFonts->set(name.c_str(), adoptRef(typeface));
+    s_sideloadedFonts->set(name.c_str(), sk_sp<SkTypeface>(typeface));
 }
 
 // static
 void FontCache::setMenuFontMetrics(const wchar_t* familyName, int32_t fontHeight)
 {
     s_menuFontFamilyName = new AtomicString(familyName);
     s_menuFontHeight = ensureMinimumFontHeightIfNeeded(fontHeight);
 }
 
 // static
 void FontCache::setSmallCaptionFontMetrics(const wchar_t* familyName, int32_t fontHeight)
 {
     s_smallCaptionFontFamilyName = new AtomicString(familyName);
     s_smallCaptionFontHeight = ensureMinimumFontHeightIfNeeded(fontHeight);
 }
 
 // static
 void FontCache::setStatusFontMetrics(const wchar_t* familyName, int32_t fontHeight)
 {
     s_statusFontFamilyName = new AtomicString(familyName);
     s_statusFontHeight = ensureMinimumFontHeightIfNeeded(fontHeight);
 }
 
 FontCache::FontCache()
     : m_purgePreventCount(0)
 {
-    m_fontManager = s_staticFontManager;
+    m_fontManager = sk_ref_sp(s_staticFontManager);
     if (!m_fontManager.get())

[f(malita), 2016/09/01 03:55:38]

Nit: no .get() needed.

[Łukasz Anforowicz, 2016/09/01 20:50:58]

Oh, right.  Done.

-        m_fontManager = adoptRef(SkFontMgr_New_DirectWrite());
+        m_fontManager.reset(SkFontMgr_New_DirectWrite());
     ASSERT(m_fontManager.get());
 }
 
 // Given the desired base font, this will create a SimpleFontData for a specific
 // font that can be used to render the given range of characters.
 PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
     const FontDescription& fontDescription, UChar32 character,
     const SimpleFontData* originalFontData,
     FontFallbackPriority fallbackPriority)
 {
@@ skipping 237 matching lines @@
 
     return false;
 }
 
 std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
     const FontFaceCreationParams& creationParams, float fontSize)
 {
     ASSERT(creationParams.creationType() == CreateFontByFamily);
 
     CString name;
-    RefPtr<SkTypeface> tf = createTypeface(fontDescription, creationParams, name);
+    sk_sp<SkTypeface> tf = createTypeface(fontDescription, creationParams, name);
     // Windows will always give us a valid pointer here, even if the face name
     // is non-existent. We have to double-check and see if the family name was
     // really used.
     if (!tf || !typefacesMatchesFamily(tf.get(), creationParams.family())) {
         AtomicString adjustedName;
         FontWeight variantWeight;
         FontStretch variantStretch;
 
         if (typefacesHasWeightSuffix(creationParams.family(), adjustedName,
             variantWeight)) {
@@ skipping 70 matching lines @@
         if (typefacesMatchesFamily(tf.get(), family)) {
             result->setMinSizeForSubpixel(minSizeForSubpixelForFont);
             break;
         }
     }
 
     return result;
 }
 
 } // namespace blink