Source/platform/fonts/mac/ComplexTextControllerCoreText.mm - Issue 139243002: StringImpl should not be referred from StringImplCF.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 139243002: StringImpl should not be referred from StringImplCF. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Removed AtomicStringCF.cpp Created 6 years, 11 months 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

Index: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

diff --git a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

index 822aa8cb8f0ff31ffad834a8b9a7d7860584969d..98b9d34e2b08d7d7683036a1f040724b1466115a 100644

--- a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

+++ b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

@@ -275,7 +275,7 @@ 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::fontCache()->getFontData(m_font.fontDescription(), fontName.get(), false, DoNotRetain).get();

+ runFontData = FontCache::fontCache()->getFontData(m_font.fontDescription(), AtomicString([(NSString *)fontName.get() UTF8String]), 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) {

« no previous file with comments | « Source/core/rendering/RenderThemeChromiumMac.mm ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | Source/wtf/text/AtomicStringCF.cpp » ('J')