summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 19:14:07 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 19:14:07 +0000
commitb9692cb2062f17604f112797a0da5b1559e5863d (patch)
tree669d1974512fa47f972629c96caf06c9283aa677 /webkit
parent5ce33e50949ca20c6196207e66125101a829237f (diff)
downloadchromium_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
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc2
-rw-r--r--webkit/tools/test_shell/test_shell.cc2
2 files changed, 2 insertions, 2 deletions
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;