summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-04 06:34:46 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-04 06:34:46 +0000
commit1954d40f3b3a57c6e2f9445c32211efee207b0cc (patch)
tree74d2df75a7639b29f476eb85a876ffe55b0a3f69
parent77c1b2939c54c0c32ccf7b7a4848cbc433c5dbec (diff)
downloadchromium_src-1954d40f3b3a57c6e2f9445c32211efee207b0cc.zip
chromium_src-1954d40f3b3a57c6e2f9445c32211efee207b0cc.tar.gz
chromium_src-1954d40f3b3a57c6e2f9445c32211efee207b0cc.tar.bz2
Enable remote fonts by default. This change introduces --disable-remote-fonts flag and obsoletes --enable-remote-fonts.
BUG=17818 TEST=(1) Start chromium WITHOUT --disable-remote-fonts. Visit http://www.alistapart.com/d/cssatten/poen.html . Verify that the page is rendered using _remote_ fonts (reference image: http://www.alistapart.com/d/cssatten/poen.png ) / (2) Start chromium WITH --disable-remote-fonts. Visit http://www.alistapart.com/d/cssatten/poen.html . Verify that the page is rendered using _local_ fonts Review URL: http://codereview.chromium.org/165236 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33800 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
-rw-r--r--chrome/common/chrome_switches.cc8
-rw-r--r--chrome/common/chrome_switches.h2
-rw-r--r--webkit/glue/webpreferences.h2
4 files changed, 7 insertions, 7 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 974a15f..85585a7 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -173,7 +173,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.uses_page_cache =
command_line.HasSwitch(switches::kEnableFastback);
web_prefs.remote_fonts_enabled =
- command_line.HasSwitch(switches::kEnableRemoteFonts);
+ !command_line.HasSwitch(switches::kDisableRemoteFonts);
web_prefs.xss_auditor_enabled =
!command_line.HasSwitch(switches::kDisableXSSAuditor);
web_prefs.application_cache_enabled =
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 07efb297..0b5dd5a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -126,6 +126,10 @@ const char kDisablePopupBlocking[] = "disable-popup-blocking";
// disable that check. This switch is used during automated testing.
const char kDisablePromptOnRepost[] = "disable-prompt-on-repost";
+// Disable remote web font support. SVG font should always work whether
+// this option is specified or not.
+const char kDisableRemoteFonts[] = "disable-remote-fonts";
+
// Enable shared workers. Functionality not yet complete.
const char kDisableSharedWorkers[] = "disable-shared-workers";
@@ -218,10 +222,6 @@ const char kEnableNewAutoFill[] = "enable-new-autofill";
// Enable Privacy Blacklists.
const char kEnablePrivacyBlacklists[] = "enable-privacy-blacklists";
-// Enable remote web font support. SVG font should always work whether
-// this option is specified or not.
-const char kEnableRemoteFonts[] = "enable-remote-fonts";
-
// Turns on the accessibility in the renderer. Off by default until
// http://b/issue?id=1432077 is fixed.
const char kEnableRendererAccessibility[] = "enable-renderer-accessibility";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index e21d56fe..c0222e2 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -51,6 +51,7 @@ extern const char kDisableNewTabFirstRun[];
extern const char kDisablePlugins[];
extern const char kDisablePopupBlocking[];
extern const char kDisablePromptOnRepost[];
+extern const char kDisableRemoteFonts[];
extern const char kDisableSharedWorkers[];
extern const char kDisableSiteSpecificQuirks[];
extern const char kDisableSync[];
@@ -78,7 +79,6 @@ extern const char kEnableMonitorProfile[];
extern const char kEnableNativeWebWorkers[];
extern const char kEnableNewAutoFill[];
extern const char kEnablePrivacyBlacklists[];
-extern const char kEnableRemoteFonts[];
extern const char kEnableRendererAccessibility[];
extern const char kEnableSeccompSandbox[];
extern const char kEnableSessionStorage[];
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 34c5a3b..fc4775d 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -90,7 +90,7 @@ struct WebPreferences {
java_enabled(true),
allow_scripts_to_close_windows(false),
uses_page_cache(false),
- remote_fonts_enabled(false),
+ remote_fonts_enabled(true),
xss_auditor_enabled(false),
local_storage_enabled(false),
databases_enabled(false),