Merge 113132 - [Chromium] Out-of-process font loading garbles text

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

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (c) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 172 matching lines @@
 // parameter.  If loading is blocked by the sandbox, the font may be loaded
 // cross-process.
 // If sandbox loading also fails, a fallback font is loaded.
 //
 // Considerations:
 // * cgFont must be CFRelease()ed by the caller when done.
 // 
 // Parameters:
 // * nsFont - The font we wish to load.
 // * fontSize - point size of the font we wish to load.
-// * outNSFont - The font that was actually loaded, may be different from nsFont
-//   if a fallback font was used.
+// * outNSFont - The font that was actually loaded or null if loading failed.
 // * cgFont - on output this contains the CGFontRef corresponding to the NSFont
 //   that was picked in the end.  The caller is responsible for calling
 //   CFRelease() on this parameter when done with it.
 // * fontID - on output, the ID corresponding to nsFont.
 void FontPlatformData::loadFont(NSFont* nsFont, float fontSize, NSFont*& outNSFont, CGFontRef& cgFont)
 {
     outNSFont = nsFont;
     cgFont = CTFontCopyGraphicsFont(toCTFontRef(outNSFont), 0);
     if (OutOfProcessFontLoadingEnabled() && outNSFont && cgFont && isLastResortFont(cgFont)) {
         // Release old CGFontRef since it points at the LastResort font which we don't want.
         CFRelease(cgFont);
         cgFont = 0;
-        
+
         // Font loading was blocked by the Sandbox.
         m_inMemoryFont = loadFontFromBrowserProcess(outNSFont);
         if (m_inMemoryFont) {
             cgFont = m_inMemoryFont->cgFont();
             
             // Need to add an extra retain so output semantics of this function
             // are consistent.
             CFRetain(cgFont);
         } else {
-            // If we still can't load the font, then return Times,
-            // rather than the LastResort font.
-            outNSFont = [NSFont fontWithName:@"Times" size:fontSize];
-            cgFont = CTFontCopyGraphicsFont(toCTFontRef(outNSFont), 0);
+            // If we still can't load the font, set |outNSFont| to null so that FontPlatformData won't be used.
+            outNSFont = 0;
         }
     }
 }
 
 } // namespace WebCore