diff options
| author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 08:29:04 +0000 |
|---|---|---|
| committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 08:29:04 +0000 |
| commit | b48f4454407c1cb008193a2a73ab4640c0291030 (patch) | |
| tree | 214592e31a2eaeba89a222ee54dcc7af56703e30 /chrome/browser/tab_contents | |
| parent | d08cf319b6b8ddb71c420602662517499682c8e3 (diff) | |
| download | chromium_src-b48f4454407c1cb008193a2a73ab4640c0291030.zip chromium_src-b48f4454407c1cb008193a2a73ab4640c0291030.tar.gz chromium_src-b48f4454407c1cb008193a2a73ab4640c0291030.tar.bz2 | |
Revert 75900 - Set the standard font from 'serif' family font.
This is regardless of serif/sans-serif preference, because we don't
have such pref UI for now.
Otherwise some languages (CJK), which has sans-serif as a default
font (IDS_STANDARD_FONT_IS_SERIF = false), they have no way to
select a standard fallback font.
Note that this is a temporary workaround that needs more fundamental fix.
BUG=73845, chromium-os:12311
TEST=manually (in Japanese, set the font and go to http://www.asahi.com )
Review URL: http://codereview.chromium.org/6568006
TBR=csilv@chromium.org
Review URL: http://codereview.chromium.org/6588004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 87d92fa..1acf625 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -203,12 +203,10 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( UTF8ToUTF16(prefs->GetString(prefs::kWebKitSerifFontFamily)); web_prefs.sans_serif_font_family = UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)); - // TODO(kochi): As we don't have setting UI for kWebKitStandardFontIsSerif, - // we always use web_prefs.serif_font_family as a standard font - // temporarily for now. Ideally we should have a pref UI for serif/sans - // selection as for CJK font sans-serif family font is the default. - // See discussion in http://crosbug.com/12311. - web_prefs.standard_font_family = web_prefs.serif_font_family; + if (prefs->GetBoolean(prefs::kWebKitStandardFontIsSerif)) + web_prefs.standard_font_family = web_prefs.serif_font_family; + else + web_prefs.standard_font_family = web_prefs.sans_serif_font_family; web_prefs.cursive_font_family = UTF8ToUTF16(prefs->GetString(prefs::kWebKitCursiveFontFamily)); web_prefs.fantasy_font_family = |