Introduce WebFallbackFont on the Chromium side

content/browser/renderer_host/sandbox_ipc_linux.cc

 // Copyright 2014 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/browser/renderer_host/sandbox_ipc_linux.h"
 
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
@@ skipping 201 matching lines @@
   PickleIterator iter(pickle);
 
   int kind;
   if (!pickle.ReadInt(&iter, &kind))
     return;
 
   if (kind == FontConfigIPC::METHOD_MATCH) {
     HandleFontMatchRequest(fd, pickle, iter, fds.get());
   } else if (kind == FontConfigIPC::METHOD_OPEN) {
     HandleFontOpenRequest(fd, pickle, iter, fds.get());
-  } else if (kind == LinuxSandbox::METHOD_GET_FONT_FAMILY_FOR_CHAR) {
-    HandleGetFontFamilyForChar(fd, pickle, iter, fds.get());
+  } else if (kind == LinuxSandbox::METHOD_GET_FALLBACK_FONT_FOR_CHAR) {
+    HandleGetFallbackFontForChar(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_LOCALTIME) {
     HandleLocaltime(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_GET_STYLE_FOR_STRIKE) {
     HandleGetStyleForStrike(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_MAKE_SHARED_MEMORY_SEGMENT) {
     HandleMakeSharedMemorySegment(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_MATCH_WITH_FALLBACK) {
     HandleMatchWithFallback(fd, pickle, iter, fds.get());
   }
 }
@@ skipping 70 matching lines @@
   // The receiver will have its own access to the file, so we will close it
   // after this send.
   SendRendererReply(fds, reply, result_fd);
 
   if (result_fd >= 0) {
     int err = IGNORE_EINTR(close(result_fd));
     DCHECK(!err);
   }
 }
 
-void SandboxIPCHandler::HandleGetFontFamilyForChar(
+void SandboxIPCHandler::HandleGetFallbackFontForChar(
     int fd,
     const Pickle& pickle,
     PickleIterator iter,
     const std::vector<base::ScopedFD*>& fds) {
   // The other side of this call is
   // content/common/child_process_sandbox_support_impl_linux.cc
 
   EnsureWebKitInitialized();
   WebUChar32 c;
   if (!pickle.ReadInt(&iter, &c))
     return;
 
   std::string preferred_locale;
   if (!pickle.ReadString(&iter, &preferred_locale))
     return;
 
-  blink::WebFontFamily family;
-  WebFontInfo::familyForChar(c, preferred_locale.c_str(), &family);
+  blink::WebFallbackFont fallbackFont;
+  WebFontInfo::fallbackFontForChar(c, preferred_locale.c_str(), &fallbackFont);

[jln (very slow on Chromium), 2014/06/10 01:52:34]

Is it clear on the Blink side of this that this is running unsandboxed and with
untrusted input?

Also I just updated my tree and I don't have fallbackFontForChar in Blink. I
presume it's not rolled in DEPS yet?

[Dominik Röttsches, 2014/06/10 07:44:52]

Yes - that is clear and unfortunately required when talking to Fontconfig.
Correct, it should arrive with a roll past r175858.

 
   Pickle reply;
-  if (family.name.data()) {
-    reply.WriteString(family.name.data());
+  if (fallbackFont.name.data()) {
+    reply.WriteString(fallbackFont.name.data());
   } else {
     reply.WriteString(std::string());
   }
-  reply.WriteBool(family.isBold);
-  reply.WriteBool(family.isItalic);
+  if (fallbackFont.filename.data()) {
+    reply.WriteString(fallbackFont.filename.data());
+  }
+  else {

[piman, 2014/06/10 01:30:09]

nit: } else {

+    reply.WriteString(std::string());
+  }
+  reply.WriteInt(fallbackFont.ttcIndex);
+  reply.WriteBool(fallbackFont.isBold);
+  reply.WriteBool(fallbackFont.isItalic);
   SendRendererReply(fds, reply, -1);
 }
 
 void SandboxIPCHandler::HandleGetStyleForStrike(
     int fd,
     const Pickle& pickle,
     PickleIterator iter,
     const std::vector<base::ScopedFD*>& fds) {
   std::string family;
   int sizeAndStyle;
@@ skipping 283 matching lines @@
 }
 
 void SandboxIPCHandler::EnsureWebKitInitialized() {
   if (webkit_platform_support_)
     return;
   webkit_platform_support_.reset(new BlinkPlatformImpl);
   blink::initializeWithoutV8(webkit_platform_support_.get());
 }
 
 }  // namespace content