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

content/browser/renderer_host/render_message_filter.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/browser/renderer_host/render_message_filter.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 515 matching lines @@
   // aka ChromeFrame then we need to retrieve cookie settings from the external
   // host.
   *cookies_enabled = content::GetContentClient()->browser()->AllowGetCookie(
       url, first_party_for_cookies, net::CookieList(), resource_context_,
       render_process_id_, MSG_ROUTING_CONTROL);
 }
 
 #if defined(OS_MACOSX)
 void RenderMessageFilter::OnLoadFont(const FontDescriptor& font,
                                      uint32* handle_size,
-                                     base::SharedMemoryHandle* handle) {
+                                     base::SharedMemoryHandle* handle,
+                                     uint32* font_id) {
   base::SharedMemory font_data;
   uint32 font_data_size = 0;
   bool ok = FontLoader::LoadFontIntoBuffer(font.ToNSFont(), &font_data,
-                &font_data_size);
-  if (!ok || font_data_size == 0) {
+                &font_data_size, font_id);
+  if (!ok || font_data_size == 0 || font_id == 0) {

[Nico, 2011/05/30 13:19:37]

Do you mean *font_id == 0 here? If not, should you just CHECK(font_id)?

     LOG(ERROR) << "Couldn't load font data for " << font.font_name <<
-        " ok=" << ok << " font_data_size=" << font_data_size;
+        " ok=" << ok << " font_data_size=" << font_data_size <<
+        " font id=" << font_id;

[Nico, 2011/05/30 13:19:37]

*font_id here too

     *handle_size = 0;
     *handle = base::SharedMemory::NULLHandle();
+    *font_id = 0;

[Nico, 2011/05/30 13:19:37]

You really mean *font_id above, else this would be a null write

     return;
   }
 
   *handle_size = font_data_size;
   font_data.GiveToProcess(base::GetCurrentProcessHandle(), handle);
 }
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)  // This hack is Windows-specific.
 void RenderMessageFilter::OnPreCacheFont(LOGFONT font) {
@@ skipping 347 matching lines @@
     file_for_transit = base::FileDescriptor(file, true);
 #endif
   }
 
   IPC::Message* reply = new ViewMsg_AsyncOpenFile_ACK(
       routing_id, error_code, file_for_transit, message_id);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, NewRunnableMethod(
           this, &RenderMessageFilter::Send, reply));
 }