Skip to content

GitLab

T
tangled
Commit 8c91a990 authored by falken@chromium.org's avatar falken@chromium.org
Browse files
Options

Revert 98603 - Add default per-script CJK fonts on Windows. 

BUG=94217,2685
TEST=view a page that uses CSS property --webkit-locale and verify that the font is the desired default

Review URL: http://codereview.chromium.org/7748014

TBR=falken@chromium.org
Review URL: http://codereview.chromium.org/7775006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98605 0039d316-1c4b-4281-b951-d872f2087c98
parent 59e98c87
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 194 deletions
chrome/app/resources/locale_settings_win.grd
View file @ 8c91a990
...@@ -216,108 +216,6 @@ ...@@ -216,108 +216,6 @@
Impact Impact
</message> </message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Japanese script on Windows. -->
<message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true">
MS PGothic
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Japanese script. -->
<message name="IDS_FIXED_FONT_FAMILY_JAPANESE" use_name_for_id="true">
MS Gothic
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Japanese script. -->
<message name="IDS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true">
MS PMincho
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Japanese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true">
MS PGothic
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Korean script. -->
<message name="IDS_STANDARD_FONT_FAMILY_KOREAN" use_name_for_id="true">
Gulim
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Korean script. -->
<message name="IDS_FIXED_FONT_FAMILY_KOREAN" use_name_for_id="true">
Gulimche
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Korean script. -->
<message name="IDS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
Batang
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Korean script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
Gulim
</message>
<!-- The default value for |WebPreference::cursive_font_family_map| for
Korean script. -->
<message name="IDS_CURSIVE_FONT_FAMILY_KOREAN" use_name_for_id="true">
Gungsuh
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Simsun
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
NSimsun
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Simsun
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Simsun
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
PMingLiU
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
MingLiU
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
PMingLiU
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
PMingLiU
</message>
<!-- The default value for |WebPreference::default_font_size| --> <!-- The default value for |WebPreference::default_font_size| -->
<message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true"> <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
16 16
......
chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
View file @ 8c91a990
...@@ -118,88 +118,6 @@ void RegisterFontFamilyMap(PrefService* prefs, const char* map_name) { ...@@ -118,88 +118,6 @@ void RegisterFontFamilyMap(PrefService* prefs, const char* map_name) {
} }
} }
struct PrefResource {
const char* pref_name;
int resource_id;
};
// Per-script font pref defaults. The prefs that have defaults vary by
// platform, since not all platforms have fonts for all scripts for all generic
// families.
// TODO(falken): add proper defaults when possible for all
// platforms/scripts/generic families.
const PrefResource kPerScriptFontDefaults[] = {
#if defined(OS_CHROMEOS)
{ prefs::kWebKitStandardFontFamilyArabic, IDS_STANDARD_FONT_FAMILY_ARABIC },
{ prefs::kWebKitSerifFontFamilyArabic, IDS_SERIF_FONT_FAMILY_ARABIC },
{ prefs::kWebKitSansSerifFontFamilyArabic,
IDS_SANS_SERIF_FONT_FAMILY_ARABIC },
{ prefs::kWebKitStandardFontFamilyJapanese,
IDS_STANDARD_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitSerifFontFamilyJapanese, IDS_SERIF_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitSansSerifFontFamilyJapanese,
IDS_SANS_SERIF_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitStandardFontFamilyKorean, IDS_STANDARD_FONT_FAMILY_KOREAN },
{ prefs::kWebKitFixedFontFamilyKorean, IDS_FIXED_FONT_FAMILY_KOREAN },
{ prefs::kWebKitSerifFontFamilyKorean, IDS_SERIF_FONT_FAMILY_KOREAN },
{ prefs::kWebKitSansSerifFontFamilyKorean,
IDS_SANS_SERIF_FONT_FAMILY_KOREAN },
{ prefs::kWebKitStandardFontFamilySimplifiedHan,
IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitFixedFontFamilySimplifiedHan,
IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitSerifFontFamilySimplifiedHan,
IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitSansSerifFontFamilySimplifiedHan,
IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitStandardFontFamilyTraditionalHan,
IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN },
{ prefs::kWebKitFixedFontFamilyTraditionalHan,
IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN },
{ prefs::kWebKitSerifFontFamilyTraditionalHan,
IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN },
{ prefs::kWebKitSansSerifFontFamilyTraditionalHan,
IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN }
#elif defined(OS_WIN)
{ prefs::kWebKitStandardFontFamilyJapanese,
IDS_STANDARD_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitSerifFontFamilyJapanese, IDS_SERIF_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitSansSerifFontFamilyJapanese,
IDS_SANS_SERIF_FONT_FAMILY_JAPANESE },
{ prefs::kWebKitStandardFontFamilyKorean, IDS_STANDARD_FONT_FAMILY_KOREAN },
{ prefs::kWebKitFixedFontFamilyKorean, IDS_FIXED_FONT_FAMILY_KOREAN },
{ prefs::kWebKitSerifFontFamilyKorean, IDS_SERIF_FONT_FAMILY_KOREAN },
{ prefs::kWebKitSansSerifFontFamilyKorean,
IDS_SANS_SERIF_FONT_FAMILY_KOREAN },
{ prefs::kWebKitCursiveFontFamilyKorean, IDS_CURSIVE_FONT_FAMILY_KOREAN },
{ prefs::kWebKitStandardFontFamilySimplifiedHan,
IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitFixedFontFamilySimplifiedHan,
IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitSerifFontFamilySimplifiedHan,
IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitSansSerifFontFamilySimplifiedHan,
IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN },
{ prefs::kWebKitStandardFontFamilyTraditionalHan,
IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN },
{ prefs::kWebKitFixedFontFamilyTraditionalHan,
IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN },
{ prefs::kWebKitSerifFontFamilyTraditionalHan,
IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN },
{ prefs::kWebKitSansSerifFontFamilyTraditionalHan,
IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN }
#endif
};
#if defined(OS_CHROMEOS) || defined(OS_WIN)
const size_t kPerScriptFontDefaultsLength = arraysize(kPerScriptFontDefaults);
#else
// Avoid compile error for arraysize on an empty array.
const size_t kPerScriptFontDefaultsLength = 0;
#endif
} // namespace } // namespace
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
...@@ -383,13 +301,58 @@ void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) { ...@@ -383,13 +301,58 @@ void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) {
IDS_FANTASY_FONT_FAMILY, IDS_FANTASY_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF); PrefService::UNSYNCABLE_PREF);
// Register per-script font prefs that have defaults. // Register per-script font prefs that have defaults. Currently defaults are
for (size_t i = 0; i < kPerScriptFontDefaultsLength; ++i) { // defined only for some scripts and only on Chrome OS to begin with (it is
prefs->RegisterLocalizedStringPref(kPerScriptFontDefaults[i].pref_name, // the easiest since we readily know what fonts are available there).
kPerScriptFontDefaults[i].resource_id, // TODO(falken): add defaults for all platforms and for scripts that should
PrefService::UNSYNCABLE_PREF); // have defaults.
} #if defined(OS_CHROMEOS)
// Register the rest of the per-script font prefs. prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyArabic,
IDS_STANDARD_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyArabic,
IDS_SERIF_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyArabic,
IDS_SANS_SERIF_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyJapanese,
IDS_STANDARD_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilyJapanese,
IDS_FIXED_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyJapanese,
IDS_SERIF_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyJapanese,
IDS_SANS_SERIF_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyKorean,
IDS_STANDARD_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilyKorean,
IDS_FIXED_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyKorean,
IDS_SERIF_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyKorean,
IDS_SANS_SERIF_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(
prefs::kWebKitStandardFontFamilySimplifiedHan,
IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilySimplifiedHan,
IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilySimplifiedHan,
IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(
prefs::kWebKitSansSerifFontFamilySimplifiedHan,
IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(
prefs::kWebKitStandardFontFamilyTraditionalHan,
IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(
prefs::kWebKitFixedFontFamilyTraditionalHan,
IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(
prefs::kWebKitSerifFontFamilyTraditionalHan,
IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedStringPref(
prefs::kWebKitSansSerifFontFamilyTraditionalHan,
IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
#endif
RegisterFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap); RegisterFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap);
RegisterFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap); RegisterFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap);
RegisterFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap); RegisterFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap);
......
chrome/common/pref_names.cc
View file @ 8c91a990
...@@ -155,8 +155,6 @@ const char kWebKitSerifFontFamilyKorean[] = ...@@ -155,8 +155,6 @@ const char kWebKitSerifFontFamilyKorean[] =
"webkit.webprefs.fonts.serif.Hang"; "webkit.webprefs.fonts.serif.Hang";
const char kWebKitSansSerifFontFamilyKorean[] = const char kWebKitSansSerifFontFamilyKorean[] =
"webkit.webprefs.fonts.sansserif.Hang"; "webkit.webprefs.fonts.sansserif.Hang";
const char kWebKitCursiveFontFamilyKorean[] =
"webkit.webprefs.fonts.cursive.Hang";
const char kWebKitStandardFontFamilySimplifiedHan[] = const char kWebKitStandardFontFamilySimplifiedHan[] =
"webkit.webprefs.fonts.standard.Hans"; "webkit.webprefs.fonts.standard.Hans";
const char kWebKitFixedFontFamilySimplifiedHan[] = const char kWebKitFixedFontFamilySimplifiedHan[] =
......
chrome/common/pref_names.h
View file @ 8c91a990
...@@ -72,7 +72,6 @@ extern const char kWebKitStandardFontFamilyKorean[]; ...@@ -72,7 +72,6 @@ extern const char kWebKitStandardFontFamilyKorean[];
extern const char kWebKitFixedFontFamilyKorean[]; extern const char kWebKitFixedFontFamilyKorean[];
extern const char kWebKitSerifFontFamilyKorean[]; extern const char kWebKitSerifFontFamilyKorean[];
extern const char kWebKitSansSerifFontFamilyKorean[]; extern const char kWebKitSansSerifFontFamilyKorean[];
extern const char kWebKitCursiveFontFamilyKorean[];
extern const char kWebKitStandardFontFamilySimplifiedHan[]; extern const char kWebKitStandardFontFamilySimplifiedHan[];
extern const char kWebKitFixedFontFamilySimplifiedHan[]; extern const char kWebKitFixedFontFamilySimplifiedHan[];
extern const char kWebKitSerifFontFamilySimplifiedHan[]; extern const char kWebKitSerifFontFamilySimplifiedHan[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment