| Index: Source/platform/fonts/FontCache.cpp
|
| diff --git a/Source/core/platform/graphics/FontCache.cpp b/Source/platform/fonts/FontCache.cpp
|
| similarity index 97%
|
| rename from Source/core/platform/graphics/FontCache.cpp
|
| rename to Source/platform/fonts/FontCache.cpp
|
| index 3106580ee6cacf10ef8e8e1feea09bd1ff67e2d1..0e9b22a3b3f8e3b3b9d7cafb4203fc2619aada57 100644
|
| --- a/Source/core/platform/graphics/FontCache.cpp
|
| +++ b/Source/platform/fonts/FontCache.cpp
|
| @@ -28,21 +28,21 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/platform/graphics/FontCache.h"
|
| +#include "platform/fonts/FontCache.h"
|
|
|
| #include "FontFamilyNames.h"
|
|
|
| #include "RuntimeEnabledFeatures.h"
|
| -#include "core/platform/graphics/FontDataCache.h"
|
| -#include "core/platform/graphics/FontFallbackList.h"
|
| -#include "core/platform/graphics/FontPlatformData.h"
|
| -#include "core/platform/graphics/opentype/OpenTypeVerticalData.h"
|
| #include "platform/fonts/AlternateFontFamily.h"
|
| #include "platform/fonts/FontCacheKey.h"
|
| +#include "platform/fonts/FontDataCache.h"
|
| #include "platform/fonts/FontDescription.h"
|
| +#include "platform/fonts/FontFallbackList.h"
|
| +#include "platform/fonts/FontPlatformData.h"
|
| #include "platform/fonts/FontSelector.h"
|
| #include "platform/fonts/FontSmoothingMode.h"
|
| #include "platform/fonts/TextRenderingMode.h"
|
| +#include "platform/fonts/opentype/OpenTypeVerticalData.h"
|
| #include "wtf/HashMap.h"
|
| #include "wtf/ListHashSet.h"
|
| #include "wtf/StdLibExtras.h"
|
| @@ -53,12 +53,6 @@ using namespace WTF;
|
|
|
| namespace WebCore {
|
|
|
| -FontCache* fontCache()
|
| -{
|
| - DEFINE_STATIC_LOCAL(FontCache, globalFontCache, ());
|
| - return &globalFontCache;
|
| -}
|
| -
|
| #if !OS(WIN) || ENABLE(GDI_FONTS_ON_WINDOWS)
|
| FontCache::FontCache()
|
| : m_purgePreventCount(0)
|
| @@ -70,6 +64,12 @@ typedef HashMap<FontCacheKey, OwnPtr<FontPlatformData>, FontCacheKeyHash, FontCa
|
|
|
| static FontPlatformDataCache* gFontPlatformDataCache = 0;
|
|
|
| +FontCache* FontCache::fontCache()
|
| +{
|
| + DEFINE_STATIC_LOCAL(FontCache, globalFontCache, ());
|
| + return &globalFontCache;
|
| +}
|
| +
|
| FontPlatformData* FontCache::getFontPlatformData(const FontDescription& fontDescription,
|
| const AtomicString& passedFamilyName, bool checkingAlternateName)
|
| {
|
|
|