Introduce WebFallbackFont on the Chromium side

content/common/child_process_sandbox_support_impl_linux.cc

Index: content/common/child_process_sandbox_support_impl_linux.cc
diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc
index c0edcfcf40a2a9ffe5bda4d2570129fbc6b0ee93..8c3c259f54e9c4f9a08daad15200333a5e7e5cdb 100644
--- a/content/common/child_process_sandbox_support_impl_linux.cc
+++ b/content/common/child_process_sandbox_support_impl_linux.cc
@@ -15,18 +15,18 @@
 #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,
-                               const char* preferred_locale,
-                               blink::WebFontFamily* family) {
+void GetFallbackFontForCharacter(int32_t character,
+                                 const char* preferred_locale,
+                                 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);
 
@@ -35,17 +35,23 @@ void GetFontFamilyForCharacter(int32_t character,
                                                   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;
     }
   }
 }