| Index: Source/core/css/CSSFontSelector.cpp
|
| diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp
|
| index 44b7198fe6e4235906aadc5ff869a458470bbf59..4f98ea0e609d6bf9c5859df298b1f1c89ac6b3eb 100644
|
| --- a/Source/core/css/CSSFontSelector.cpp
|
| +++ b/Source/core/css/CSSFontSelector.cpp
|
| @@ -40,8 +40,8 @@
|
| #include "core/loader/FrameLoader.h"
|
| #include "core/frame/Frame.h"
|
| #include "core/page/Settings.h"
|
| -#include "core/platform/graphics/FontCache.h"
|
| -#include "core/platform/graphics/SimpleFontData.h"
|
| +#include "platform/fonts/FontCache.h"
|
| +#include "platform/fonts/SimpleFontData.h"
|
| #include "wtf/text/AtomicString.h"
|
|
|
| using namespace std;
|
| @@ -116,13 +116,13 @@ CSSFontSelector::CSSFontSelector(Document* document)
|
|
|
| ASSERT(m_document);
|
| ASSERT(m_document->frame());
|
| - fontCache()->addClient(this);
|
| + FontCache::fontCache()->addClient(this);
|
| }
|
|
|
| CSSFontSelector::~CSSFontSelector()
|
| {
|
| clearDocument();
|
| - fontCache()->removeClient(this);
|
| + FontCache::fontCache()->removeClient(this);
|
| }
|
|
|
| void CSSFontSelector::registerForInvalidationCallbacks(FontSelectorClient* client)
|
| @@ -201,7 +201,7 @@ PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDes
|
| if (settingsFamilyName.isEmpty())
|
| return 0;
|
|
|
| - return fontCache()->getFontData(fontDescription, settingsFamilyName);
|
| + return FontCache::fontCache()->getFontData(fontDescription, settingsFamilyName);
|
| }
|
|
|
| CSSSegmentedFontFace* CSSFontSelector::getFontFace(const FontDescription& fontDescription, const AtomicString& familyName)
|
|
|