third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h - Issue 2222283002: Fix scriptCodeForHanFromSubtags() may return non-Han scripts

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: third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h

Issue 2222283002: Fix scriptCodeForHanFromSubtags() may return non-Han scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp ('k') | third_party/WebKit/Source/platform/text/LocaleToScriptMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h

diff --git a/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h b/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h

index 041d29a609ba8741bda1ce659445b8cc36b709e2..f193d447650d363bf80eb27a29d2fb23d04c0d38 100644

--- a/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h

+++ b/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.h

@@ -44,6 +44,16 @@ PLATFORM_EXPORT UScriptCode scriptNameToCode(const String&);

PLATFORM_EXPORT UScriptCode scriptCodeForHanFromSubtags(const String&, char delimiter = '-');

+inline bool isUnambiguousHanScript(UScriptCode script)

+ // localeToScriptCodeForFontSelection() does not return these values.

+ DCHECK(script != USCRIPT_HIRAGANA && script != USCRIPT_KATAKANA);

+ return script == USCRIPT_KATAKANA_OR_HIRAGANA

+ || script == USCRIPT_SIMPLIFIED_HAN

+ || script == USCRIPT_TRADITIONAL_HAN

+ || script == USCRIPT_HANGUL;

}

#endif