Index: Source/platform/fonts/mac/SimpleFontDataMac.mm |
diff --git a/Source/core/platform/graphics/mac/SimpleFontDataMac.mm b/Source/platform/fonts/mac/SimpleFontDataMac.mm |
similarity index 98% |
rename from Source/core/platform/graphics/mac/SimpleFontDataMac.mm |
rename to Source/platform/fonts/mac/SimpleFontDataMac.mm |
index b0448b6af5228448fd28c9c78c1235e11608f38e..dbe573f6a1eb7ae47a405d9142140255cc750c04 100644 |
--- a/Source/core/platform/graphics/mac/SimpleFontDataMac.mm |
+++ b/Source/platform/fonts/mac/SimpleFontDataMac.mm |
@@ -25,15 +25,15 @@ |
*/ |
#import "config.h" |
-#import "core/platform/graphics/SimpleFontData.h" |
+#import "platform/fonts/SimpleFontData.h" |
#import <AppKit/AppKit.h> |
#import <ApplicationServices/ApplicationServices.h> |
#import <float.h> |
#import <unicode/uchar.h> |
#import "platform/SharedBuffer.h" |
-#import "core/platform/graphics/Font.h" |
-#import "core/platform/graphics/FontCache.h" |
+#import "platform/fonts/Font.h" |
+#import "platform/fonts/FontCache.h" |
#import "platform/fonts/FontDescription.h" |
#import "platform/geometry/FloatRect.h" |
#import "platform/graphics/Color.h" |
@@ -293,10 +293,10 @@ void SimpleFontData::platformDestroy() |
if (!isCustomFont() && m_derivedFontData) { |
// These come from the cache. |
if (m_derivedFontData->smallCaps) |
- fontCache()->releaseFontData(m_derivedFontData->smallCaps.get()); |
+ FontCache::fontCache()->releaseFontData(m_derivedFontData->smallCaps.get()); |
if (m_derivedFontData->emphasisMark) |
- fontCache()->releaseFontData(m_derivedFontData->emphasisMark.get()); |
+ FontCache::fontCache()->releaseFontData(m_derivedFontData->emphasisMark.get()); |
} |
} |
@@ -330,7 +330,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const Fo |
scaledFontData.m_syntheticOblique = (fontTraits & NSItalicFontMask) && !(scaledFontTraits & NSItalicFontMask); |
// SimpleFontData::platformDestroy() takes care of not deleting the cached font data twice. |
- return fontCache()->fontDataFromFontPlatformData(&scaledFontData); |
+ return FontCache::fontCache()->fontDataFromFontPlatformData(&scaledFontData); |
} |
END_BLOCK_OBJC_EXCEPTIONS; |