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

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

 /*
  * Copyright (c) 2010 Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CrossProcessFontLoading_h
 #define CrossProcessFontLoading_h
 
 #import <wtf/RefCounted.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/text/WTFString.h>
 
 typedef struct CGFont* CGFontRef;
 typedef UInt32 ATSFontContainerRef;
 typedef UInt32 ATSFontRef;
 
 namespace WebCore {
 
 // MemoryActivatedFont encapsulates a font loaded from another process and
 // activated from memory.
 //
@@ skipping 20 matching lines @@
 // correspond to the same on-disk font file are always the same and don't change
 // with time.
 //
 // Flushing caches:
 // When the system notifies us of a system font cache flush, all FontDataCache
 // objects are destroyed.  This should in turn dereference all
 // MemoryActivatedFonts and thus unload all in-memory fonts.
 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.
     CGFontRef cgFont() { return m_cgFont.get(); }
     
     // Get cached ATSFontRef corresponding to the in-memory font.
     ATSFontRef atsFontRef() { return m_atsFontRef; }
 
 private:
     // srcFontRef - ATSFontRef belonging to the NSFont object that failed to
     // 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
 
 #endif // CrossProcessFontLoading_h