| Index: Source/platform/fonts/mac/FontCacheMac.mm
|
| diff --git a/Source/core/platform/graphics/mac/FontCacheMac.mm b/Source/platform/fonts/mac/FontCacheMac.mm
|
| similarity index 97%
|
| rename from Source/core/platform/graphics/mac/FontCacheMac.mm
|
| rename to Source/platform/fonts/mac/FontCacheMac.mm
|
| index 9389fc35556af62e01a043c0c822b103bc3b538e..ef8862c10067b78ed1e70e426fdb06014db97790 100644
|
| --- a/Source/core/platform/graphics/mac/FontCacheMac.mm
|
| +++ b/Source/platform/fonts/mac/FontCacheMac.mm
|
| @@ -28,12 +28,12 @@
|
| */
|
|
|
| #import "config.h"
|
| -#import "core/platform/graphics/FontCache.h"
|
| +#import "platform/fonts/FontCache.h"
|
|
|
| #import <AppKit/AppKit.h>
|
| -#import "core/platform/graphics/FontPlatformData.h"
|
| -#import "core/platform/graphics/SimpleFontData.h"
|
| #import "platform/fonts/FontDescription.h"
|
| +#import "platform/fonts/FontPlatformData.h"
|
| +#import "platform/fonts/SimpleFontData.h"
|
| #import "platform/mac/WebFontCache.h"
|
| #import <wtf/MainThread.h>
|
| #import <wtf/StdLibExtras.h>
|
| @@ -54,12 +54,12 @@ static void invalidateFontCache(void*)
|
| callOnMainThread(&invalidateFontCache, 0);
|
| return;
|
| }
|
| - fontCache()->invalidate();
|
| + FontCache::fontCache()->invalidate();
|
| }
|
|
|
| static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCenterRef, void* observer, CFStringRef name, const void *, CFDictionaryRef)
|
| {
|
| - ASSERT_UNUSED(observer, observer == fontCache());
|
| + ASSERT_UNUSED(observer, observer == FontCache::fontCache());
|
| ASSERT_UNUSED(name, CFEqual(name, kCTFontManagerRegisteredFontsChangedNotification));
|
| invalidateFontCache(0);
|
| }
|
|
|