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

third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (c) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 55 matching lines @@
                                                              values,
                                                              WTF_ARRAY_LENGTH(keys),
                                                              &kCFTypeDictionaryKeyCallBacks,
                                                              &kCFTypeDictionaryValueCallBacks));
 
     descriptor = CTFontDescriptorCreateWithAttributes(attributes.get());
 
     return descriptor;
 }
 
-static PassRefPtr<SkTypeface> loadFromBrowserProcess(NSFont* nsFont, float textSize)
+static sk_sp<SkTypeface> loadFromBrowserProcess(NSFont* nsFont, float textSize)
 {
     // Send cross-process request to load font.
     WebSandboxSupport* sandboxSupport = Platform::current()->sandboxSupport();
     if (!sandboxSupport) {
         // This function should only be called in response to an error loading a
         // font due to being blocked by the sandbox.
         // This by definition shouldn't happen if there is no sandbox support.
         ASSERT_NOT_REACHED();
         return nullptr;
     }
 
     CGFontRef loadedCgFont;
     uint32_t fontID;
     if (!sandboxSupport->loadFont(nsFont, &loadedCgFont, &fontID)) {
         // TODO crbug.com/461279: Make this appear in the inspector console?
         DLOG(ERROR) << "Loading user font \"" << [[nsFont familyName] UTF8String] << "\" from non system location failed. Corrupt or missing font file?";
         return nullptr;
     }
     RetainPtr<CGFontRef> cgFont(AdoptCF, loadedCgFont);
     RetainPtr<CTFontRef> ctFont(AdoptCF, CTFontCreateWithGraphicsFont(cgFont.get(), textSize, 0, cascadeToLastResortFontDescriptor()));
-    PassRefPtr<SkTypeface> returnFont = adoptRef(SkCreateTypefaceFromCTFont(ctFont.get(), cgFont.get()));
+    sk_sp<SkTypeface> returnFont(SkCreateTypefaceFromCTFont(ctFont.get(), cgFont.get()));
 
     if (!returnFont.get())
         // TODO crbug.com/461279: Make this appear in the inspector console?
         DLOG(ERROR) << "Instantiating SkTypeface from user font failed for font family \"" << [[nsFont familyName] UTF8String] << "\".";
     return returnFont;
 }
 
 void FontPlatformData::setupPaint(SkPaint* paint, float, const Font* font) const
 {
     bool shouldSmoothFonts = true;
@@ skipping 18 matching lines @@
 
     if (LayoutTestSupport::isRunningLayoutTest()) {
         shouldSmoothFonts = false;
         shouldAntialias = shouldAntialias && LayoutTestSupport::isFontAntialiasingEnabledForTest();
     }
 
     paint->setAntiAlias(shouldAntialias);
     paint->setEmbeddedBitmapText(false);
     const float ts = m_textSize >= 0 ? m_textSize : 12;
     paint->setTextSize(SkFloatToScalar(ts));
-    paint->setTypeface(toSkSp(m_typeface));
+    paint->setTypeface(m_typeface);
     paint->setFakeBoldText(m_syntheticBold);
     paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
     paint->setLCDRenderText(shouldSmoothFonts);
     paint->setSubpixelText(true);
 
     // When rendering using CoreGraphics, disable hinting when webkit-font-smoothing:antialiased or
     // text-rendering:geometricPrecision is used.
     // See crbug.com/152304
     if (font && (font->getFontDescription().fontSmoothing() == Antialiased || font->getFontDescription().textRendering() == GeometricPrecision))
         paint->setHinting(SkPaint::kNo_Hinting);
 }
 
 FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation)
     : m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_isHashTableDeletedValue(false)
 {
     DCHECK(nsFont);
     if (canLoadInProcess(nsFont)) {
-        m_typeface = adoptRef(SkCreateTypefaceFromCTFont(toCTFontRef(nsFont)));
+        m_typeface.reset(SkCreateTypefaceFromCTFont(toCTFontRef(nsFont)));
     } else {
         // In process loading fails for cases where third party font manager software
         // registers fonts in non system locations such as /Library/Fonts
         // and ~/Library Fonts, see crbug.com/72727 or crbug.com/108645.
         m_typeface = loadFromBrowserProcess(nsFont, size);
     }
 }
 
 } // namespace blink