Merge 92269 - [Chromium] Fix OOP font loading to work on 10.6.6 and above.

Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.h

Index: Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.h
===================================================================
--- Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.h	(revision 92838)
+++ Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.h	(working copy)
@@ -33,6 +33,7 @@
 
 #import <wtf/RefCounted.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/text/WTFString.h>
 
 typedef struct CGFont* CGFontRef;
 typedef UInt32 ATSFontContainerRef;
@@ -73,7 +74,7 @@
 class MemoryActivatedFont : public RefCounted<MemoryActivatedFont> {
 public:
     // Use to create a new object, see docs on constructor below.
-    static PassRefPtr<MemoryActivatedFont> create(ATSFontContainerRef srcFontContainerRef, ATSFontContainerRef container);
+    static PassRefPtr<MemoryActivatedFont> create(uint32_t fontID, NSFont*, ATSFontContainerRef);
     ~MemoryActivatedFont();
     
     // Get cached CGFontRef corresponding to the in-memory font.
@@ -87,12 +88,13 @@
     // load in-process.
     // container - a font container corresponding to an identical font that
     // we loaded cross-process.
-    MemoryActivatedFont(ATSFontContainerRef srcFontContainerRef, ATSFontContainerRef container);
+    MemoryActivatedFont(uint32_t fontID, NSFont*, ATSFontContainerRef);
 
     ATSFontContainerRef m_fontContainer;
     WTF::RetainPtr<CGFontRef> m_cgFont;
     ATSFontRef m_atsFontRef;
-    ATSFontContainerRef m_srcFontContainerRef;
+    uint32_t m_fontID;
+    WTF::String m_inSandboxHashKey;
 };
 
 } // namespace WebCore