Move to SkStreamAsset for SkTypeface streams.

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 <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
 
 #include "base/debug/trace_event.h"
 #include "base/files/file_util.h"
 #include "base/pickle.h"
 #include "base/posix/unix_domain_socket_linux.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/SkStream.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 
 namespace content {
 
 // Return a stream from the file descriptor, or NULL on failure.
-SkStream* StreamFromFD(int fd) {
+SkStreamAsset* StreamFromFD(int fd) {
   skia::RefPtr<SkData> data = skia::AdoptRef(SkData::NewFromFD(fd));
   if (!data) {
     return NULL;
   }
   return new SkMemoryStream(data.get());
 }
 
 void CloseFD(int fd) {
   int err = IGNORE_EINTR(close(fd));
   DCHECK(!err);
@@ skipping 49 matching lines @@
   if (outFontIdentity)
     *outFontIdentity = reply_identity;
   if (outFamilyName)
     *outFamilyName = reply_family;
   if (outStyle)
     *outStyle = static_cast<SkTypeface::Style>(reply_style);
 
   return true;
 }
 
-SkStream* FontConfigIPC::openStream(const FontIdentity& identity) {
+SkStreamAsset* FontConfigIPC::openStream(const FontIdentity& identity) {
   TRACE_EVENT0("sandbox_ipc", "FontConfigIPC::openStream");
   Pickle request;
   request.WriteInt(METHOD_OPEN);
   request.WriteUInt32(identity.fID);
 
   int result_fd = -1;
   uint8_t reply_buf[256];
   const ssize_t r = UnixDomainSocket::SendRecvMsg(fd_, reply_buf,
                                                   sizeof(reply_buf),
                                                   &result_fd, request);
 
   if (r == -1)
     return NULL;
 
   Pickle reply(reinterpret_cast<char*>(reply_buf), r);
   bool result;
   PickleIterator iter(reply);
   if (!iter.ReadBool(&result) || !result) {
     if (result_fd)
       CloseFD(result_fd);
     return NULL;
   }
 
-  SkStream* stream = StreamFromFD(result_fd);
+  SkStreamAsset* stream = StreamFromFD(result_fd);
   CloseFD(result_fd);
   return stream;
 }
 
 }  // namespace content