Mac: Part 1 of a fix to get OOP font loading working in the renderer on 10.6.6 .

content/renderer/renderer_webkitclient_impl.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/renderer/renderer_webkitclient_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/platform_file.h"
@@ skipping 95 matching lines @@
   virtual base::PlatformFile openFile(const WebKit::WebString& path,
                                       int mode);
 };
 
 class RendererWebKitClientImpl::SandboxSupport
     : public WebKit::WebSandboxSupport {
  public:
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
+  // TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
   virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
+  virtual bool loadFont(
+      NSFont* srcFont, ATSFontContainerRef* container, uint32* fontID);
 #elif defined(OS_LINUX)
   virtual WebKit::WebString getFontFamilyForCharacters(
       const WebKit::WebUChar* characters,
       size_t numCharacters,
       const char* preferred_locale);
   virtual void getRenderStyleForStrike(
       const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out);
 
  private:
   // WebKit likes to ask us for the correct font family to use for a set of
@@ skipping 329 matching lines @@
 }
 
 void RendererWebKitClientImpl::SandboxSupport::getRenderStyleForStrike(
     const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) {
   child_process_sandbox_support::getRenderStyleForStrike(family, sizeAndStyle,
                                                          out);
 }
 
 #elif defined(OS_MACOSX)
 
+// TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
 bool RendererWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont,
     ATSFontContainerRef* out) {
+  uint32 temp;
+  return loadFont(srcFont, out, &temp);
+}
+
+bool RendererWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont,

[brettw, 2011/05/30 13:05:47]

Style: the args should be aligned horizontally, so move the first arg down to
the next line (I'd probably put them on separate lines as well, but that's less
rigidly defined).

+    ATSFontContainerRef* container, uint32* fontID) {
   DCHECK(srcFont);
-  DCHECK(out);
+  DCHECK(container);
+  DCHECK(fontID);
 
   uint32 font_data_size;
   FontDescriptor src_font_descriptor(srcFont);
   base::SharedMemoryHandle font_data;
   if (!RenderThread::current()->Send(new ViewHostMsg_LoadFont(
-        src_font_descriptor, &font_data_size, &font_data))) {
+        src_font_descriptor, &font_data_size, &font_data, fontID))) {
     LOG(ERROR) << "Sending ViewHostMsg_LoadFont() IPC failed for " <<
         src_font_descriptor.font_name;
-    *out = kATSFontContainerRefUnspecified;
+    *container = kATSFontContainerRefUnspecified;
+    *fontID = 0;
     return false;
   }
 
-  if (font_data_size == 0 || font_data == base::SharedMemory::NULLHandle()) {
+  if (font_data_size == 0 || font_data == base::SharedMemory::NULLHandle() ||
+      *fontID == 0) {
     LOG(ERROR) << "Bad response from ViewHostMsg_LoadFont() for " <<
         src_font_descriptor.font_name;
-    *out = kATSFontContainerRefUnspecified;
+    *container = kATSFontContainerRefUnspecified;
+    *fontID = 0;
     return false;
   }
 
-  return FontLoader::ATSFontContainerFromBuffer(font_data, font_data_size, out);
+  // TODO(jeremy): Need to call back into WebKit to make sure that the font
+  // isn't already activated, based on the font id.  If it's already
+  // activated, don't reactivate it here - crbug.com/72727 .
+  return FontLoader::ATSFontContainerFromBuffer(font_data, font_data_size,
+      container);
 }
 
 #endif
 
 //------------------------------------------------------------------------------
 
 WebKitClient::FileHandle RendererWebKitClientImpl::databaseOpenFile(
     const WebString& vfs_file_name, int desired_flags) {
   return DatabaseUtil::DatabaseOpenFile(vfs_file_name, desired_flags);
 }
@@ skipping 76 matching lines @@
 }
 
 //------------------------------------------------------------------------------
 
 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() {
   // RenderThread::current can be NULL when running some tests.
   if (!blob_registry_.get() && RenderThread::current())
     blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current()));
   return blob_registry_.get();
 }