Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1138)

Unified Diff: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

Issue 99103006: Moving GraphicsContext and dependencies from core to platform. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final patch - fixes Android Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/mac/ComplexTextController.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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())
« no previous file with comments | « Source/platform/fonts/mac/ComplexTextController.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698