| Index: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
|
| diff --git a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
|
| similarity index 97%
|
| rename from Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
|
| rename to Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
|
| index cfb5cd3d60de598af843fb4bcd9537b6feda0384..27cab9a6585bd97887ff84d3c96f22edf8f0c150 100644
|
| --- a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
|
| +++ b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm
|
| @@ -24,10 +24,10 @@
|
|
|
| #include "config.h"
|
|
|
| -#include "core/platform/graphics/mac/ComplexTextController.h"
|
| +#include "platform/fonts/mac/ComplexTextController.h"
|
|
|
| -#include "core/platform/graphics/Font.h"
|
| -#include "core/platform/graphics/FontCache.h"
|
| +#include "platform/fonts/Font.h"
|
| +#include "platform/fonts/FontCache.h"
|
| #include "platform/graphics/TextRun.h"
|
|
|
| #include <ApplicationServices/ApplicationServices.h>
|
| @@ -275,12 +275,12 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,
|
| m_complexTextRuns.append(ComplexTextRun::create(m_font.primaryFont(), cp, stringLocation + runRange.location, runRange.length, m_run.ltr()));
|
| continue;
|
| }
|
| - runFontData = fontCache()->getFontData(m_font.fontDescription(), fontName.get(), false, DoNotRetain).get();
|
| + runFontData = FontCache::fontCache()->getFontData(m_font.fontDescription(), fontName.get(), false, DoNotRetain).get();
|
| // Core Text may have used a font that is not known to NSFontManager. In that case, fall back on
|
| // using the font as returned, even though it may not have the best NSFontRenderingMode.
|
| if (!runFontData) {
|
| FontPlatformData runFontPlatformData((NSFont *)runFont, CTFontGetSize(runFont), m_font.fontDescription().usePrinterFont());
|
| - runFontData = fontCache()->fontDataFromFontPlatformData(&runFontPlatformData, DoNotRetain).get();
|
| + runFontData = FontCache::fontCache()->fontDataFromFontPlatformData(&runFontPlatformData, DoNotRetain).get();
|
| }
|
| }
|
| if (m_fallbackFonts && runFontData != m_font.primaryFont())
|
|
|