Chromium Code Reviews| Index: Source/core/platform/graphics/CrossProcessFontLoading.mm |
| diff --git a/Source/core/platform/graphics/chromium/CrossProcessFontLoading.mm b/Source/core/platform/graphics/CrossProcessFontLoading.mm |
| similarity index 98% |
| rename from Source/core/platform/graphics/chromium/CrossProcessFontLoading.mm |
| rename to Source/core/platform/graphics/CrossProcessFontLoading.mm |
| index 4c6bdfae4f6f5955e5af00a068f14b7be2ffa72b..39787e03b05a51cb1869b1cad8f7da423a906e94 100644 |
| --- a/Source/core/platform/graphics/chromium/CrossProcessFontLoading.mm |
| +++ b/Source/core/platform/graphics/CrossProcessFontLoading.mm |
| @@ -27,7 +27,7 @@ |
| // do the loading of in-memory fonts and keep track of them. |
| #import "config.h" |
| -#import "core/platform/graphics/chromium/CrossProcessFontLoading.h" |
| +#import "core/platform/graphics/CrossProcessFontLoading.h" |
| #import <AppKit/NSFont.h> |
|
Stephen Chennney
2013/11/14 20:08:33
Definitely needs to be in the mac directory.
|
| #import "core/platform/graphics/FontPlatformData.h" |
| @@ -171,7 +171,7 @@ MemoryActivatedFont::~MemoryActivatedFont() |
| // |
| // 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. |
| @@ -193,7 +193,7 @@ void FontPlatformData::loadFont(NSFont* nsFont, float fontSize, NSFont*& outNSFo |
| 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); |