Remove all uses of skia::RefPtr and stale includes

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>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
 
 #include <functional>
 #include <memory>
 
 #include "base/files/file_util.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/ref_counted.h"
 #include "base/pickle.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
-#include "skia/ext/refptr.h"
 #include "skia/ext/skia_utils_base.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
 namespace content {
 
 std::size_t SkFontConfigInterfaceFontIdentityHash::operator()(
     const SkFontConfigInterface::FontIdentity& sp) const {
   std::hash<std::string> stringhash;
   std::hash<int> inthash;
   size_t r = inthash(sp.fID);
@@ skipping 77 matching lines @@
   delete static_cast<base::MemoryMappedFile*>(context);
 }
 
 SkMemoryStream* FontConfigIPC::mapFileDescriptorToStream(int fd) {
   std::unique_ptr<base::MemoryMappedFile> mapped_font_file(
       new base::MemoryMappedFile);
   base::ThreadRestrictions::ScopedAllowIO allow_mmap;
   mapped_font_file->Initialize(base::File(fd));
   DCHECK(mapped_font_file->IsValid());
 
-  auto data = skia::AdoptRef(
-      SkData::NewWithProc(mapped_font_file->data(), mapped_font_file->length(),
-                          &DestroyMemoryMappedFile, mapped_font_file.get()));
+  sk_sp<SkData> data =
+      SkData::MakeWithProc(mapped_font_file->data(), mapped_font_file->length(),
+                           &DestroyMemoryMappedFile, mapped_font_file.get());
   if (!data)
     return nullptr;
   ignore_result(mapped_font_file.release()); // Ownership transferred to SkDataB
-  return new SkMemoryStream(data.get());
+  return new SkMemoryStream(data);

[f(malita), 2016/05/04 17:22:13]

std::move(data)

[tomhudson, 2016/05/04 17:47:10]

Done.

 }
 
 SkStreamAsset* FontConfigIPC::openStream(const FontIdentity& identity) {
   TRACE_EVENT0("sandbox_ipc", "FontConfigIPC::openStream");
 
   base::Pickle request;
   request.WriteInt(METHOD_OPEN);
   request.WriteUInt32(identity.fID);
 
   int result_fd = -1;
@@ skipping 18 matching lines @@
 SkTypeface* FontConfigIPC::createTypeface(
     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());
 
   SkStreamAsset* typeface_stream = openStream(identity);
   if (!typeface_stream)
     return nullptr;
-  skia::RefPtr<SkTypeface> typeface_from_stream = skia::AdoptRef(
+  sk_sp<SkTypeface> typeface_from_stream(
       SkTypeface::CreateFromStream(typeface_stream, identity.fTTCIndex));
   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.release();

[f(malita), 2016/05/04 17:22:13]

I'm not familiar with HashingMRUCache, but this looks a bit iffy (is the
iterator pointing to the just-inserted value and we're stealing it?).

return sk_sp<>(mapped_typefaces_insert_it->second) to preserve existing
semantics and stay on the safe side?

[tomhudson, 2016/05/04 17:47:10]

I'm not happy with this either, but it's inheriting from a base class that
hasn't been updated to return sk_sp<> yet. If we want that, we can put this CL
on hold until that one is finished.

[f(malita), 2016/05/04 18:12:22]

Would certainly be nice to return a smart ref from this method, but you're right
- looks like that'll take some Skia work.

I think it's fine to land this CL as long as we're sticking to the existing
semantics: don't steal the insert iter ref but return a new one (same as
before).

  return SkSafeRef(mapped_typefaces_insert_it->second.get());

[tomhudson, 2016/05/26 20:33:16]

Done.

 }
 
 }  // namespace content