Use new getFontFamilyForCharacters() API.

content/common/child_process_sandbox_support_impl_linux.cc

 // Copyright (c) 2011 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/child_process_sandbox_support_impl_linux.h"
 
 #include <sys/stat.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/global_descriptors_posix.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "content/common/chrome_descriptors.h"
 #include "content/common/sandbox_methods_linux.h"
 #include "content/common/unix_domain_socket_posix.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontFamily.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h"
 
 static int GetSandboxFD() {
   return kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor;
 }
 
 namespace content {
 
-std::string GetFontFamilyForCharacters(const uint16_t* utf16,
-                                       size_t num_utf16,
-                                       const char* preferred_locale) {
+void GetFontFamilyForCharacters(const uint16_t* utf16,
+                                size_t num_utf16,
+                                const char* preferred_locale,
+                                WebKit::WebFontFamily* family) {
   Pickle request;
   request.WriteInt(LinuxSandbox::METHOD_GET_FONT_FAMILY_FOR_CHARS);
   request.WriteInt(num_utf16);
   for (size_t i = 0; i < num_utf16; ++i)
     request.WriteUInt32(utf16[i]);
   request.WriteString(preferred_locale);
 
   uint8_t buf[512];
   const ssize_t n = UnixDomainSocket::SendRecvMsg(GetSandboxFD(), buf,
                                                   sizeof(buf), NULL, request);
 
   std::string family_name;
+  bool isBold = false;
+  bool isItalic = false;
   if (n != -1) {
     Pickle reply(reinterpret_cast<char*>(buf), n);
     void* pickle_iter = NULL;
-    reply.ReadString(&pickle_iter, &family_name);
+    if (reply.ReadString(&pickle_iter, &family_name) &&
+        reply.ReadBool(&pickle_iter, &isBold) &&
+        reply.ReadBool(&pickle_iter, &isItalic)) {
+      family->name = family_name;
+      family->isBold = isBold;
+      family->isItalic = isItalic;
+    }
   }
-
-  return family_name;
 }
 
 void GetRenderStyleForStrike(const char* family, int sizeAndStyle,
                              WebKit::WebFontRenderStyle* out) {
   Pickle request;
   request.WriteInt(LinuxSandbox::METHOD_GET_STYLE_FOR_STRIKE);
   request.WriteString(family);
   request.WriteInt(sizeAndStyle);
 
   uint8_t buf[512];
@@ skipping 123 matching lines @@
 
   *output_length = length;
   n = HANDLE_EINTR(pread(fd, output, length, offset));
   if (n != static_cast<ssize_t>(length))
     return false;
 
   return true;
 }
 
 }  // namespace content