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

Unified Diff: Source/platform/fonts/win/FontFallbackWin.cpp

Issue 1327143002: Make sure getFallbackFamily() always sets *scriptChecked. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@pinned
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/win/FontFallbackWin.cpp
diff --git a/Source/platform/fonts/win/FontFallbackWin.cpp b/Source/platform/fonts/win/FontFallbackWin.cpp
index bde67857344e53832311bdc02184ce6e62a73c69..732e5c8ee358a25e26ba3f9a61cf478f6c89ff7e 100644
--- a/Source/platform/fonts/win/FontFallbackWin.cpp
+++ b/Source/platform/fonts/win/FontFallbackWin.cpp
@@ -404,8 +404,11 @@ const UChar* getFallbackFamily(UChar32 character,
ASSERT(character);
ASSERT(fontManager);
const UChar* family = getFontBasedOnUnicodeBlock(character, fontManager);
- if (family)
+ if (family) {
+ if (scriptChecked)
+ *scriptChecked = USCRIPT_INVALID_CODE;
return family;
+ }
UScriptCode script = getScript(character);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698