Introduce WebFallbackFont on the Chromium side

content/common/child_process_sandbox_support_impl_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/child_process_sandbox_support_impl_linux.h"
 
 #include <sys/stat.h>
 
 #include "base/debug/trace_event.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/sys_byteorder.h"
 #include "content/common/sandbox_linux/sandbox_linux.h"
 #include "content/common/zygote_commands_linux.h"
-#include "third_party/WebKit/public/platform/linux/WebFontFamily.h"
+#include "third_party/WebKit/public/platform/linux/WebFallbackFont.h"
 #include "third_party/WebKit/public/platform/linux/WebFontRenderStyle.h"
 
 namespace content {
 
-void GetFontFamilyForCharacter(int32_t character,
+void GetFallbackFontForCharacter(int32_t character,
                                const char* preferred_locale,
-                               blink::WebFontFamily* family) {
+                               blink::WebFallbackFont* fallbackFont) {
   TRACE_EVENT0("sandbox_ipc", "GetFontFamilyForCharacter");
 
   Pickle request;
-  request.WriteInt(LinuxSandbox::METHOD_GET_FONT_FAMILY_FOR_CHAR);
+  request.WriteInt(LinuxSandbox::METHOD_GET_FALLBACK_FONT_FOR_CHAR);
   request.WriteInt(character);
   request.WriteString(preferred_locale);
 
   uint8_t buf[512];
   const ssize_t n = UnixDomainSocket::SendRecvMsg(GetSandboxFD(), buf,
                                                   sizeof(buf), NULL, request);
 
   std::string family_name;
+  std::string filename;
+  int ttcIndex = 0;
   bool isBold = false;
   bool isItalic = false;
   if (n != -1) {
     Pickle reply(reinterpret_cast<char*>(buf), n);
     PickleIterator pickle_iter(reply);
     if (reply.ReadString(&pickle_iter, &family_name) &&
+        reply.ReadString(&pickle_iter, &filename) &&
+        reply.ReadInt(&pickle_iter, &ttcIndex) &&
         reply.ReadBool(&pickle_iter, &isBold) &&
         reply.ReadBool(&pickle_iter, &isItalic)) {
-      family->name = family_name;
-      family->isBold = isBold;
-      family->isItalic = isItalic;
+      fallbackFont->name = family_name;
+      fallbackFont->filename = filename;
+      fallbackFont->ttcIndex = ttcIndex;
+      fallbackFont->isBold = isBold;
+      fallbackFont->isItalic = isItalic;
     }
   }
 }
 
 void GetRenderStyleForStrike(const char* family, int sizeAndStyle,
                              blink::WebFontRenderStyle* out) {
   TRACE_EVENT0("sandbox_ipc", "GetRenderStyleForStrike");
 
   Pickle request;
   request.WriteInt(LinuxSandbox::METHOD_GET_STYLE_FOR_STRIKE);
@@ skipping 124 matching lines @@
 }
 
 bool SendZygoteChildPing(int fd) {
   return UnixDomainSocket::SendMsg(fd,
                                    kZygoteChildPingMessage,
                                    sizeof(kZygoteChildPingMessage),
                                    std::vector<int>());
 }
 
 }  // namespace content