summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webpreferences.cc3
-rw-r--r--webkit/glue/webpreferences.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index e14788e..785bdbf 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -48,6 +48,7 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setDownloadableBinaryFontsEnabled(remote_fonts_enabled);
settings->setXSSAuditorEnabled(xss_auditor_enabled);
settings->setLocalStorageEnabled(local_storage_enabled);
+ settings->setDatabasesEnabled(WebKit::databasesEnabled() || databases_enabled);
settings->setSessionStorageEnabled(session_storage_enabled);
settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled);
@@ -63,8 +64,6 @@ void WebPreferences::Apply(WebView* web_view) const {
// Turn this on to cause WebCore to paint the resize corner for us.
settings->setShouldPaintCustomScrollbars(true);
- settings->setDatabasesEnabled(WebKit::databasesEnabled());
-
// Mitigate attacks from local HTML files by not granting file:// URLs
// universal access.
settings->setAllowUniversalAccessFromFileURLs(false);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index c48339fa..f0ab0bb 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -45,6 +45,7 @@ struct WebPreferences {
bool remote_fonts_enabled;
bool xss_auditor_enabled;
bool local_storage_enabled;
+ bool databases_enabled;
bool session_storage_enabled;
bool application_cache_enabled;
@@ -85,6 +86,7 @@ struct WebPreferences {
remote_fonts_enabled(false),
xss_auditor_enabled(false),
local_storage_enabled(false),
+ databases_enabled(false),
session_storage_enabled(false),
application_cache_enabled(false),
user_style_sheet_enabled(false) {