diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 08:52:47 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 08:52:47 +0000 |
| commit | fa1b5dace74e745d2484012f98559d69825078f5 (patch) | |
| tree | e25b919f546afd26209ac1a8351362571c2f30bf /webkit/glue/webpreferences.cc | |
| parent | a84d37604865e6d46dbbcf43af5f974e687f55a9 (diff) | |
| download | chromium_src-fa1b5dace74e745d2484012f98559d69825078f5.zip chromium_src-fa1b5dace74e745d2484012f98559d69825078f5.tar.gz chromium_src-fa1b5dace74e745d2484012f98559d69825078f5.tar.bz2 | |
Revert r24223. Storage test is not working.
TBR=mpcomplete@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.cc')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 785bdbf..e14788e 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -48,7 +48,6 @@ 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); @@ -64,6 +63,8 @@ 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); |