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

Source/WebCore/platform/chromium/PlatformBridge.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 133 matching lines @@
     static long long seekFile(PlatformFileHandle, long long offset, FileSeekOrigin);
     static bool truncateFile(PlatformFileHandle, long long offset);
     static int readFromFile(PlatformFileHandle, char* data, int length);
     static int writeToFile(PlatformFileHandle, const char* data, int length);
 
     // Font ---------------------------------------------------------------
 #if OS(WINDOWS)
     static bool ensureFontLoaded(HFONT);
 #endif
 #if OS(DARWIN)
-    static bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
+    static bool loadFont(NSFont* srcFont, ATSFontContainerRef*, uint32_t* fontID);
 #elif OS(UNIX)
     static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);
     static String getFontFamilyForCharacters(const UChar*, size_t numCharacters, const char* preferredLocale);
 #endif
 
     // Forms --------------------------------------------------------------
     static void notifyFormStateChanged(const Document*);
 
     // Databases ----------------------------------------------------------
     // Returns a handle to the DB file and ooptionally a handle to its containing directory
@@ skipping 239 matching lines @@
 
     // Visited links ------------------------------------------------------
     static LinkHash visitedLinkHash(const UChar* url, unsigned length);
     static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
     static bool isLinkVisited(LinkHash);
 };
 
 } // namespace WebCore
 
 #endif