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

Source/WebKit/chromium/public/mac/WebSandboxSupport.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 28 matching lines @@
 class NSFont;
 #endif
 
 namespace WebKit {
 
 // Put methods here that are required due to sandbox restrictions.
 class WebSandboxSupport {
 public:
     // Given an input font - |srcFont| [which can't be loaded due to sandbox
     // restrictions].  Return a font container belonging to an equivalent
-    // font file that can be used to access the font.
+    // font file that can be used to access the font and a unique identifier
+    // corresponding to the on-disk font file.
     //
     // Note that a font container may contain multiple fonts, the caller is
     // responsible for retreiving the appropriate font from the container.
     //
     // If this function succeeds, the caller assumes ownership of the |out|
     // parameter and must call ATSFontDeactivate() to unload it when done.
     //
     // Returns: true on success, false on error.
-    virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out) = 0;
+    virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef*, uint32_t* fontID) = 0;
 };
 
 } // namespace WebKit
 
 #endif