| Index: Source/core/css/CSSFontFaceSource.cpp
|
| diff --git a/Source/core/css/CSSFontFaceSource.cpp b/Source/core/css/CSSFontFaceSource.cpp
|
| index 1df230551d08e36af0427b094eba800afeae528b..d235aea7edfe1462e40cad6667ca5787a2e07d50 100644
|
| --- a/Source/core/css/CSSFontFaceSource.cpp
|
| +++ b/Source/core/css/CSSFontFaceSource.cpp
|
| @@ -29,9 +29,9 @@
|
| #include "RuntimeEnabledFeatures.h"
|
| #include "core/css/CSSCustomFontData.h"
|
| #include "core/css/CSSFontFace.h"
|
| -#include "core/platform/graphics/FontCache.h"
|
| -#include "core/platform/graphics/SimpleFontData.h"
|
| +#include "platform/fonts/FontCache.h"
|
| #include "platform/fonts/FontDescription.h"
|
| +#include "platform/fonts/SimpleFontData.h"
|
| #include "public/platform/Platform.h"
|
| #include "wtf/CurrentTime.h"
|
|
|
| @@ -135,7 +135,7 @@ PassRefPtr<SimpleFontData> CSSFontFaceSource::getFontData(const FontDescription&
|
| if (isLocal()) {
|
| // We're local. Just return a SimpleFontData from the normal cache.
|
| // We don't want to check alternate font family names here, so pass true as the checkingAlternateName parameter.
|
| - RefPtr<SimpleFontData> fontData = fontCache()->getFontData(fontDescription, m_string, true);
|
| + RefPtr<SimpleFontData> fontData = FontCache::fontCache()->getFontData(fontDescription, m_string, true);
|
| m_histograms.recordLocalFont(fontData);
|
| return fontData;
|
| }
|
| @@ -218,7 +218,7 @@ PassRefPtr<SimpleFontData> CSSFontFaceSource::getFontData(const FontDescription&
|
| } else {
|
| // This temporary font is not retained and should not be returned.
|
| FontCachePurgePreventer fontCachePurgePreventer;
|
| - SimpleFontData* temporaryFont = fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
|
| + SimpleFontData* temporaryFont = FontCache::fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
|
| RefPtr<CSSCustomFontData> cssFontData = CSSCustomFontData::create(true);
|
| cssFontData->setCSSFontFaceSource(this);
|
| fontData = SimpleFontData::create(temporaryFont->platformData(), cssFontData);
|
| @@ -259,7 +259,7 @@ bool CSSFontFaceSource::isLocalFontAvailable(const FontDescription& fontDescript
|
| {
|
| if (!isLocal())
|
| return false;
|
| - return fontCache()->isPlatformFontAvailable(fontDescription, m_string);
|
| + return FontCache::fontCache()->isPlatformFontAvailable(fontDescription, m_string);
|
| }
|
|
|
| void CSSFontFaceSource::beginLoadIfNeeded()
|
|
|