Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1373)

Unified Diff: Source/core/platform/graphics/mac/MemoryActivatedFont.mm

Issue 26679003: Move platform/graphics/chromium/* to platform/graphics/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rename fix Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « Source/core/platform/graphics/mac/MemoryActivatedFont.h ('k') | Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698