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

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index efdb533b0f2d70eaa56c82221e0905d0de5c1d64..180dc3a4f5fb6b1592799e6b39eaac6bced7de00 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -533,16 +533,19 @@ void RenderMessageFilter::OnCookiesEnabled(
 #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;
   }