summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-14 00:22:24 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-14 00:22:24 +0000
commit0072afd455e4150510938e2f7dc554dbf88ddb48 (patch)
tree311d806483fa78b9961f25e41fbca7d1aefce12d /webkit/glue
parent8813d05958802f4ac0186f8cd140833fa4c25873 (diff)
downloadchromium_src-0072afd455e4150510938e2f7dc554dbf88ddb48.zip
chromium_src-0072afd455e4150510938e2f7dc554dbf88ddb48.tar.gz
chromium_src-0072afd455e4150510938e2f7dc554dbf88ddb48.tar.bz2
Re-enable DNS prefetch. This feature got disable accidentially in WebKit
because it is off by default. In this patch, we explicitly turn the feature on. Review URL: http://codereview.chromium.org/7021008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webpreferences.cc2
-rw-r--r--webkit/glue/webpreferences.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 818f445..79ca2fa 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -49,6 +49,7 @@ WebPreferences::WebPreferences()
remote_fonts_enabled(true),
javascript_can_access_clipboard(false),
xss_auditor_enabled(false),
+ dns_prefetching_enabled(true),
local_storage_enabled(false),
databases_enabled(false),
application_cache_enabled(false),
@@ -120,6 +121,7 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setDownloadableBinaryFontsEnabled(remote_fonts_enabled);
settings->setJavaScriptCanAccessClipboard(javascript_can_access_clipboard);
settings->setXSSAuditorEnabled(xss_auditor_enabled);
+ settings->setDNSPrefetchingEnabled(dns_prefetching_enabled);
settings->setLocalStorageEnabled(local_storage_enabled);
WebRuntimeFeatures::enableDatabase(
WebRuntimeFeatures::isDatabaseEnabled() || databases_enabled);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 1b400f2..1c7361d 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -53,6 +53,10 @@ struct WebPreferences {
bool remote_fonts_enabled;
bool javascript_can_access_clipboard;
bool xss_auditor_enabled;
+ // We don't use dns_prefetching_enabled to disable DNS prefetching. Instead,
+ // we disable the feature at a lower layer so that we catch non-WebKit uses
+ // of DNS prefetch as well.
+ bool dns_prefetching_enabled;
bool local_storage_enabled;
bool databases_enabled;
bool application_cache_enabled;