| Index: Source/platform/fonts/FontFastPath.cpp
|
| diff --git a/Source/core/platform/graphics/FontFastPath.cpp b/Source/platform/fonts/FontFastPath.cpp
|
| similarity index 98%
|
| rename from Source/core/platform/graphics/FontFastPath.cpp
|
| rename to Source/platform/fonts/FontFastPath.cpp
|
| index af0183dc95434003587464364c58a77c026099c7..fab7d9943c31b5e312d8bc8f1571ce1c286c2b3f 100644
|
| --- a/Source/core/platform/graphics/FontFastPath.cpp
|
| +++ b/Source/platform/fonts/FontFastPath.cpp
|
| @@ -21,14 +21,14 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/platform/graphics/Font.h"
|
| +#include "platform/fonts/Font.h"
|
|
|
| -#include "core/platform/graphics/FontCache.h"
|
| -#include "core/platform/graphics/FontFallbackList.h"
|
| -#include "core/platform/graphics/GlyphPageTreeNode.h"
|
| -#include "core/platform/graphics/SimpleFontData.h"
|
| -#include "core/platform/graphics/WidthIterator.h"
|
| #include "platform/LayoutUnit.h"
|
| +#include "platform/fonts/FontCache.h"
|
| +#include "platform/fonts/FontFallbackList.h"
|
| +#include "platform/fonts/GlyphPageTreeNode.h"
|
| +#include "platform/fonts/SimpleFontData.h"
|
| +#include "platform/fonts/WidthIterator.h"
|
| #include "platform/fonts/GlyphBuffer.h"
|
| #include "platform/geometry/FloatRect.h"
|
| #include "platform/graphics/TextRun.h"
|
| @@ -278,7 +278,7 @@ std::pair<GlyphData, GlyphPage*> Font::glyphDataAndPageForCharacter(UChar32 c, b
|
| if (characterToRender <= 0xFFFF)
|
| characterToRender = Font::normalizeSpaces(characterToRender);
|
| const SimpleFontData* fontDataToSubstitute = fontDataAt(0)->fontDataForCharacter(characterToRender);
|
| - RefPtr<SimpleFontData> characterFontData = fontCache()->platformFallbackForCharacter(m_fontDescription, characterToRender, fontDataToSubstitute, isPlatformFont());
|
| + RefPtr<SimpleFontData> characterFontData = FontCache::fontCache()->platformFallbackForCharacter(m_fontDescription, characterToRender, fontDataToSubstitute, isPlatformFont());
|
| if (characterFontData) {
|
| if (characterFontData->platformData().orientation() == Vertical && !characterFontData->hasVerticalGlyphs() && isCJKIdeographOrSymbol(c))
|
| variant = BrokenIdeographVariant;
|
|
|