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

Unified Diff: Source/platform/fonts/FontDescription.cpp

Issue 1135003004: Make small-caps work correctly with tr locale (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add back TestExpectations change Created 5 years, 7 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 | « Source/platform/fonts/FontDescription.h ('k') | Source/wtf/text/StringImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontDescription.cpp
diff --git a/Source/platform/fonts/FontDescription.cpp b/Source/platform/fonts/FontDescription.cpp
index 3cf71204176eb6e92860697d4aba2939926362dd..b26c41fbcfd00fe2e4aa18aa40964059dd6be770 100644
--- a/Source/platform/fonts/FontDescription.cpp
+++ b/Source/platform/fonts/FontDescription.cpp
@@ -131,9 +131,9 @@ static const AtomicString& defaultLocale()
return locale;
}
-const AtomicString& FontDescription::locale() const
+const AtomicString& FontDescription::locale(bool includeDefault) const
{
- if (m_locale.isNull())
+ if (m_locale.isNull() && includeDefault)
return defaultLocale();
return m_locale;
}
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | Source/wtf/text/StringImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698