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

third_party/WebKit/Source/web/linux/WebFontRendering.cpp

Index: third_party/WebKit/Source/web/linux/WebFontRendering.cpp
diff --git a/third_party/WebKit/Source/web/linux/WebFontRendering.cpp b/third_party/WebKit/Source/web/linux/WebFontRendering.cpp
index 2132f01a56b915fd920383acf4b3e1c898ac9132..1fa78cdb03b67e4665e41514c04354ec6e0bfc0b 100644
--- a/third_party/WebKit/Source/web/linux/WebFontRendering.cpp
+++ b/third_party/WebKit/Source/web/linux/WebFontRendering.cpp
@@ -44,7 +44,7 @@ namespace blink {
 void WebFontRendering::setSkiaFontManager(SkFontMgr* fontMgr)
 {
     WTF::adopted(fontMgr);
-    FontCache::setFontManager(RefPtr<SkFontMgr>(fontMgr));
+    FontCache::setFontManager(sk_sp<SkFontMgr>(fontMgr));

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

This looks iffy: prev RefPtr ctor is grabbing a new ref, while the current sk_sp
ctor is adopting.

We prolly need to use sk_ref_sp() instead.

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

Done, although things are interesting here.  AFAICT, there is only a single
callsite of the linux version of this method:


Callsite #1: content/zygote/zygote_main_linux.cc:401:
blink::WebFontRendering::setSkiaFontManager(SkFontMgr_New_Android(&custom));

Note that SkFontMgr_New_Android returns a raw pointer to a newly
constructed/allocated object that needs to be *adopted*:
third_party/skia/src/ports/SkFontMgr_android.cpp:
SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom) {
...
    return new SkFontMgr_Android(custom);
}


The callsite below is for the windows implementation (which I've admittedly
broken in the same way...):
Callsite #2: content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc:75:
  sk_sp<SkFontMgr> skia_font_manager(SkFontMgr_New_DirectWrite(
      factory.Get(), g_font_collection.Get(), font_fallback.Get()));
  blink::WebFontRendering::setSkiaFontManager(skia_font_manager.get());
  // Add an extra ref for SetDefaultSkiaFactory, which keeps a ref but doesn't
  // addref.
  skia_font_manager->ref();
  SetDefaultSkiaFactory(skia_font_manager.get());


In the case of callsite #2, it does seem that we need to get an extra ref-count
inside blink::WebFontRendering::setSkiaFontManager.  Therefore, as you've
suggested, I've added sk_ref_sp (to preserve the old behavior) in both the linux
and the win version.

 }
 
 // static