diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 19:14:07 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 19:14:07 +0000 |
| commit | b9692cb2062f17604f112797a0da5b1559e5863d (patch) | |
| tree | 669d1974512fa47f972629c96caf06c9283aa677 | |
| parent | 5ce33e50949ca20c6196207e66125101a829237f (diff) | |
| download | chromium_src-b9692cb2062f17604f112797a0da5b1559e5863d.zip chromium_src-b9692cb2062f17604f112797a0da5b1559e5863d.tar.gz chromium_src-b9692cb2062f17604f112797a0da5b1559e5863d.tar.bz2 | |
Change default minimum font size to 0
Chromium side of http://trac.webkit.org/changeset/72141, needed to pass Acid3.
Changes the default minimum font size from 1 to 0.
BUG=none
TEST=acid3
Review URL: http://codereview.chromium.org/4954002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66488 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/resources/locale_settings_cros.grd | 2 | ||||
| -rw-r--r-- | chrome/app/resources/locale_settings_linux.grd | 2 | ||||
| -rw-r--r-- | chrome/app/resources/locale_settings_mac.grd | 2 | ||||
| -rw-r--r-- | chrome/app/resources/locale_settings_win.grd | 2 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/app/resources/locale_settings_cros.grd b/chrome/app/resources/locale_settings_cros.grd index 6149451..46c0a15 100644 --- a/chrome/app/resources/locale_settings_cros.grd +++ b/chrome/app/resources/locale_settings_cros.grd @@ -167,7 +167,7 @@ <!-- The default value for |WebPreference::minimum_font_size| --> <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true"> - 1 + 0 </message> <!-- The default value for |WebPreference::minimum_logical_font_size|. --> diff --git a/chrome/app/resources/locale_settings_linux.grd b/chrome/app/resources/locale_settings_linux.grd index 24f1b50..f81c84e 100644 --- a/chrome/app/resources/locale_settings_linux.grd +++ b/chrome/app/resources/locale_settings_linux.grd @@ -167,7 +167,7 @@ <!-- The default value for |WebPreference::minimum_font_size| --> <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true"> - 1 + 0 </message> <!-- The default value for |WebPreference::minimum_logical_font_size|. --> diff --git a/chrome/app/resources/locale_settings_mac.grd b/chrome/app/resources/locale_settings_mac.grd index 3469e5f..335b48f 100644 --- a/chrome/app/resources/locale_settings_mac.grd +++ b/chrome/app/resources/locale_settings_mac.grd @@ -167,7 +167,7 @@ <!-- The default value for |WebPreference::minimum_font_size| --> <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true"> - 1 + 0 </message> <!-- The default value for |WebPreference::minimum_logical_font_size|. --> diff --git a/chrome/app/resources/locale_settings_win.grd b/chrome/app/resources/locale_settings_win.grd index 2fa6543..ed502bd 100644 --- a/chrome/app/resources/locale_settings_win.grd +++ b/chrome/app/resources/locale_settings_win.grd @@ -172,7 +172,7 @@ <!-- The default value for |WebPreference::minimum_font_size| --> <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true"> - 1 + 0 </message> <!-- The default value for |WebPreference::minimum_logical_font_size|. --> diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index ecb2c38..afd41cf 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -29,7 +29,7 @@ WebPreferences::WebPreferences() fantasy_font_family(), // Not sure what to use on Windows. default_font_size(16), default_fixed_font_size(13), - minimum_font_size(1), + minimum_font_size(0), minimum_logical_font_size(6), default_encoding("ISO-8859-1"), javascript_enabled(true), diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 12797fe..0cb40d9 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -497,7 +497,7 @@ void TestShell::ResetWebPreferences() { web_prefs_->default_encoding = "ISO-8859-1"; web_prefs_->default_font_size = 16; web_prefs_->default_fixed_font_size = 13; - web_prefs_->minimum_font_size = 1; + web_prefs_->minimum_font_size = 0; web_prefs_->minimum_logical_font_size = 9; web_prefs_->javascript_can_open_windows_automatically = true; web_prefs_->dom_paste_enabled = true; |