Source/platform/fonts/Font.cpp - Issue 326763002: Adding WebFallbackFont and renaming SimpleFontFamily

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/Font.cpp

Issue 326763002: Adding WebFallbackFont and renaming SimpleFontFamily (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixing mac build Created 6 years, 6 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/Font.cpp

diff --git a/Source/platform/fonts/Font.cpp b/Source/platform/fonts/Font.cpp

index a10f380fba89f8e385e2670870992912205a8638..848251467a954e367f050dfb898d9882f213dfa9 100644

--- a/Source/platform/fonts/Font.cpp

+++ b/Source/platform/fonts/Font.cpp

@@ -511,7 +511,7 @@ std::pair<GlyphData, GlyphPage*> Font::glyphDataAndPageForCharacter(UChar32 c, b

if (characterToRender <= 0xFFFF)

characterToRender = Character::normalizeSpaces(characterToRender);

const SimpleFontData* fontDataToSubstitute = fontDataAt(0)->fontDataForCharacter(characterToRender);

- RefPtr<SimpleFontData> characterFontData = FontCache::fontCache()->platformFallbackForCharacter(m_fontDescription, characterToRender, fontDataToSubstitute);

+ RefPtr<SimpleFontData> characterFontData = FontCache::fontCache()->fallbackFontForCharacter(m_fontDescription, characterToRender, fontDataToSubstitute);

if (characterFontData) {

if (characterFontData->platformData().orientation() == Vertical && !characterFontData->hasVerticalGlyphs() && Character::isCJKIdeographOrSymbol(c))

variant = BrokenIdeographVariant;

« no previous file with comments | « Source/platform/exported/linux/WebFontInfo.cpp ('k') | Source/platform/fonts/FontCache.h » ('j') | no next file with comments »