SkFontConfigInterface createTypeface to makeTypeface.

content/common/font_config_ipc_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/font_config_ipc_linux.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdint.h>
 #include <sys/mman.h>
@@ skipping 140 matching lines @@
   base::PickleIterator iter(reply);
   if (!iter.ReadBool(&result) || !result) {
     if (result_fd)
       CloseFD(result_fd);
     return NULL;
   }
 
   return mapFileDescriptorToStream(result_fd);
 }
 
-SkTypeface* FontConfigIPC::createTypeface(
+sk_sp<SkTypeface> FontConfigIPC::makeTypeface(
     const SkFontConfigInterface::FontIdentity& identity) {
   base::AutoLock lock(lock_);
   auto mapped_typefaces_it = mapped_typefaces_.Get(identity);
   if (mapped_typefaces_it != mapped_typefaces_.end())
-    return SkSafeRef(mapped_typefaces_it->second.get());
+    return mapped_typefaces_it->second;
 
   SkStreamAsset* typeface_stream = openStream(identity);
   if (!typeface_stream)
     return nullptr;
   sk_sp<SkTypeface> typeface_from_stream(
       SkTypeface::CreateFromStream(typeface_stream, identity.fTTCIndex));

[f(malita), 2016/06/03 17:11:59]

SkTypeface::MakeFromStream while here?

[bungeman-chromium, 2016/06/03 18:28:18]

Done.

   auto mapped_typefaces_insert_it =
       mapped_typefaces_.Put(identity, typeface_from_stream);
-  return SkSafeRef(mapped_typefaces_insert_it->second.get());
+  return mapped_typefaces_insert_it->second;

[f(malita), 2016/06/03 17:11:59]

Not new to this CL, but I wonder if it'd help to return typeface_from_stream
instead - would RVO avoid a ref churn cycle?

[bungeman-chromium, 2016/06/03 18:28:18]

Ah, I see, the stack has a ref and then the map gets a ref; so you're suggesting
this should return the ref from the stack instead of copying the ref from the
map. Good idea.

However, I think we want it to be very clear that we're returning whatever is in
the map. Fortunately, 'Put' takes the payload by universal reference so we can
just construct the sk_sp and move directly into the map, then return a copy of
what ended up in the map.

Done.

[f(malita), 2016/06/03 19:04:03]

Awesome, thanks!

 }
 
 }  // namespace content