| Index: Source/core/platform/graphics/mac/MemoryActivatedFont.mm
|
| diff --git a/Source/core/platform/graphics/chromium/CrossProcessFontLoading.mm b/Source/core/platform/graphics/mac/MemoryActivatedFont.mm
|
| similarity index 98%
|
| rename from Source/core/platform/graphics/chromium/CrossProcessFontLoading.mm
|
| rename to Source/core/platform/graphics/mac/MemoryActivatedFont.mm
|
| index 4c6bdfae4f6f5955e5af00a068f14b7be2ffa72b..42fffb94419298fa8bc69519cf758b75d8cacf4c 100644
|
| --- a/Source/core/platform/graphics/chromium/CrossProcessFontLoading.mm
|
| +++ b/Source/core/platform/graphics/mac/MemoryActivatedFont.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/mac/MemoryActivatedFont.h"
|
|
|
| #import <AppKit/NSFont.h>
|
| #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);
|
|
|