Source/core/css/CSSFontSelector.cpp - Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter

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/core/css/CSSFontSelector.cpp

Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@fontcleanup

Patch Set: Pure Android only Created 7 years, 3 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

« ManualTests/font-fallback-locale.html ('K') | « ManualTests/font-fallback-locale.html ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | Source/core/platform/graphics/FontCache.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSFontSelector.cpp

diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp

index bfe6bfefa7478aee003eba7bbd33af4d865e09bd..36abb664aa24ea7b43c1b79eff1da03c73d3cee3 100644

--- a/Source/core/css/CSSFontSelector.cpp

+++ b/Source/core/css/CSSFontSelector.cpp

@@ -43,6 +43,7 @@

#include "core/page/Settings.h"

#include "core/platform/graphics/FontCache.h"

#include "core/platform/graphics/SimpleFontData.h"

+#include "core/platform/text/LocaleToScriptMapping.h"

#include "wtf/text/AtomicString.h"

using namespace std;

@@ -168,7 +169,7 @@ static PassRefPtr<FontData> fontDataForGenericFamily(Document* document, const F

return 0;

AtomicString genericFamily;

- UScriptCode script = fontDescription.script();

+ UScriptCode script = localeToScriptCodeForFontSelection(fontDescription.locale());

if (familyName == serifFamily)

genericFamily = settings->serifFontFamily(script);