| Index: Source/platform/fonts/FontCache.h
|
| diff --git a/Source/core/platform/graphics/FontCache.h b/Source/platform/fonts/FontCache.h
|
| similarity index 94%
|
| rename from Source/core/platform/graphics/FontCache.h
|
| rename to Source/platform/fonts/FontCache.h
|
| index 45840680ca544e12a05f25f55c5781600ad0d826..8dde8caf322f00a42fe2b5eb07f1e14ef93911c5 100644
|
| --- a/Source/core/platform/graphics/FontCache.h
|
| +++ b/Source/platform/fonts/FontCache.h
|
| @@ -31,6 +31,7 @@
|
| #define FontCache_h
|
|
|
| #include <limits.h>
|
| +#include "platform/PlatformExport.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefPtr.h"
|
| @@ -63,12 +64,12 @@ class SimpleFontData;
|
| enum ShouldRetain { Retain, DoNotRetain };
|
| enum PurgeSeverity { PurgeIfNeeded, ForcePurge };
|
|
|
| -class FontCache {
|
| +class PLATFORM_EXPORT FontCache {
|
| friend class FontCachePurgePreventer;
|
|
|
| WTF_MAKE_NONCOPYABLE(FontCache); WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| - friend FontCache* fontCache();
|
| + static FontCache* fontCache();
|
|
|
| void releaseFontData(const SimpleFontData*);
|
|
|
| @@ -150,13 +151,10 @@ private:
|
| friend class FontFallbackList;
|
| };
|
|
|
| -// Get the global fontCache.
|
| -FontCache* fontCache();
|
| -
|
| -class FontCachePurgePreventer {
|
| +class PLATFORM_EXPORT FontCachePurgePreventer {
|
| public:
|
| - FontCachePurgePreventer() { fontCache()->disablePurging(); }
|
| - ~FontCachePurgePreventer() { fontCache()->enablePurging(); }
|
| + FontCachePurgePreventer() { FontCache::fontCache()->disablePurging(); }
|
| + ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
|
| };
|
|
|
| }
|
|
|