summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
-rw-r--r--chrome/common/render_messages.h2
-rw-r--r--chrome/renderer/render_thread.cc5
-rw-r--r--webkit/api/public/WebKit.h4
-rw-r--r--webkit/api/public/WebSettings.h1
-rw-r--r--webkit/api/src/WebKit.cpp15
-rw-r--r--webkit/api/src/WebSettingsImpl.cpp5
-rw-r--r--webkit/api/src/WebSettingsImpl.h1
-rw-r--r--webkit/glue/webpreferences.cc1
-rw-r--r--webkit/glue/webpreferences.h2
-rw-r--r--webkit/tools/test_shell/test_shell.cc1
12 files changed, 26 insertions, 15 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 7831ab5..0c2a7b0 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -523,6 +523,8 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
switches::kEnableDatabases,
switches::kDisableByteRangeSupport,
switches::kEnableWebSockets,
+ switches::kEnableLocalStorage,
+ switches::kEnableSessionStorage,
};
for (size_t i = 0; i < arraysize(switch_names); ++i) {
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 a0b0c41..b46e392 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -183,8 +183,6 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
command_line.HasSwitch(switches::kEnableLocalStorage);
web_prefs.databases_enabled =
command_line.HasSwitch(switches::kEnableDatabases);
- web_prefs.session_storage_enabled =
- command_line.HasSwitch(switches::kEnableSessionStorage);
web_prefs.experimental_webgl_enabled =
command_line.HasSwitch(switches::kEnableExperimentalWebGL);
web_prefs.experimental_notifications_enabled =
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 0ef796c..be090f3 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1518,7 +1518,6 @@ struct ParamTraits<WebPreferences> {
WriteParam(m, p.xss_auditor_enabled);
WriteParam(m, p.local_storage_enabled);
WriteParam(m, p.databases_enabled);
- WriteParam(m, p.session_storage_enabled);
WriteParam(m, p.application_cache_enabled);
WriteParam(m, p.tabs_to_links);
WriteParam(m, p.user_style_sheet_enabled);
@@ -1558,7 +1557,6 @@ struct ParamTraits<WebPreferences> {
ReadParam(m, iter, &p->xss_auditor_enabled) &&
ReadParam(m, iter, &p->local_storage_enabled) &&
ReadParam(m, iter, &p->databases_enabled) &&
- ReadParam(m, iter, &p->session_storage_enabled) &&
ReadParam(m, iter, &p->application_cache_enabled) &&
ReadParam(m, iter, &p->tabs_to_links) &&
ReadParam(m, iter, &p->user_style_sheet_enabled) &&
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 3ccdd85..f1a528c 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -500,6 +500,11 @@ void RenderThread::EnsureWebKitInitialized() {
if (command_line.HasSwitch(switches::kEnableWebSockets))
WebKit::enableWebSockets();
+
+ WebKit::setLocalStorageEnabled(
+ command_line.HasSwitch(switches::kEnableLocalStorage));
+ WebKit::setSessionStorageEnabled(
+ command_line.HasSwitch(switches::kEnableSessionStorage));
}
void RenderThread::IdleHandler() {
diff --git a/webkit/api/public/WebKit.h b/webkit/api/public/WebKit.h
index cf2cea1..445e2a5 100644
--- a/webkit/api/public/WebKit.h
+++ b/webkit/api/public/WebKit.h
@@ -87,6 +87,10 @@ namespace WebKit {
WEBKIT_API void enableWebSockets();
WEBKIT_API bool webSocketsEnabled();
+ // Enables HTML5 DOM Storage support.
+ WEBKIT_API void setLocalStorageEnabled(bool enabled);
+ WEBKIT_API void setSessionStorageEnabled(bool enabled);
+
} // namespace WebKit
#endif
diff --git a/webkit/api/public/WebSettings.h b/webkit/api/public/WebSettings.h
index ab6dbd2..ecbeda6 100644
--- a/webkit/api/public/WebSettings.h
+++ b/webkit/api/public/WebSettings.h
@@ -71,7 +71,6 @@ namespace WebKit {
virtual void setDownloadableBinaryFontsEnabled(bool) = 0;
virtual void setXSSAuditorEnabled(bool) = 0;
virtual void setLocalStorageEnabled(bool) = 0;
- virtual void setSessionStorageEnabled(bool) = 0;
virtual void setEditableLinkBehaviorNeverLive() = 0;
virtual void setFontRenderingModeNormal() = 0;
virtual void setShouldPaintCustomScrollbars(bool) = 0;
diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp
index c0ea7a3..915031c 100644
--- a/webkit/api/src/WebKit.cpp
+++ b/webkit/api/src/WebKit.cpp
@@ -39,6 +39,7 @@
#include "FrameLoader.h"
#include "Page.h"
#include "SecurityOrigin.h"
+#include "Storage.h"
#include "TextEncoding.h"
#include "WebSocket.h"
#include "WorkerContextExecutionProxy.h"
@@ -162,4 +163,18 @@ bool webSocketsEnabled()
#endif
}
+void setLocalStorageEnabled(bool enabled)
+{
+#if ENABLE(DOM_STORAGE)
+ WebCore::Storage::setLocalStorageAvailable(enabled);
+#endif
+}
+
+void setSessionStorageEnabled(bool enabled)
+{
+#if ENABLE(DOM_STORAGE)
+ WebCore::Storage::setSessionStorageAvailable(enabled);
+#endif
+}
+
} // namespace WebKit
diff --git a/webkit/api/src/WebSettingsImpl.cpp b/webkit/api/src/WebSettingsImpl.cpp
index c74c16f..a193871d 100644
--- a/webkit/api/src/WebSettingsImpl.cpp
+++ b/webkit/api/src/WebSettingsImpl.cpp
@@ -195,11 +195,6 @@ void WebSettingsImpl::setLocalStorageEnabled(bool enabled)
m_settings->setLocalStorageEnabled(enabled);
}
-void WebSettingsImpl::setSessionStorageEnabled(bool enabled)
-{
- m_settings->setSessionStorageEnabled(enabled);
-}
-
void WebSettingsImpl::setEditableLinkBehaviorNeverLive()
{
// FIXME: If you ever need more behaviors than this, then we should probably
diff --git a/webkit/api/src/WebSettingsImpl.h b/webkit/api/src/WebSettingsImpl.h
index cd56497..0fd6c3f 100644
--- a/webkit/api/src/WebSettingsImpl.h
+++ b/webkit/api/src/WebSettingsImpl.h
@@ -73,7 +73,6 @@ namespace WebKit {
virtual void setDownloadableBinaryFontsEnabled(bool);
virtual void setXSSAuditorEnabled(bool);
virtual void setLocalStorageEnabled(bool);
- virtual void setSessionStorageEnabled(bool);
virtual void setEditableLinkBehaviorNeverLive();
virtual void setFontRenderingModeNormal();
virtual void setShouldPaintCustomScrollbars(bool);
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index cdb7260..a2a2b71 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -51,7 +51,6 @@ void WebPreferences::Apply(WebView* web_view) const {
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);
settings->setExperimentalNotificationsEnabled(
experimental_notifications_enabled);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 0693fb9..13a8c7b3 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -48,7 +48,6 @@ struct WebPreferences {
bool xss_auditor_enabled;
bool local_storage_enabled;
bool databases_enabled;
- bool session_storage_enabled;
bool application_cache_enabled;
bool tabs_to_links;
@@ -94,7 +93,6 @@ struct WebPreferences {
xss_auditor_enabled(false),
local_storage_enabled(false),
databases_enabled(false),
- session_storage_enabled(false),
application_cache_enabled(false),
tabs_to_links(true),
user_style_sheet_enabled(false),
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 5c28287..4fb5e82 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -425,7 +425,6 @@ void TestShell::ResetWebPreferences() {
// lose the coverage of dynamic font tests in webkit test.
web_prefs_->remote_fonts_enabled = true;
web_prefs_->local_storage_enabled = true;
- web_prefs_->session_storage_enabled = true;
web_prefs_->application_cache_enabled = true;
web_prefs_->databases_enabled = true;
// LayoutTests were written with Safari Mac in mind which does not allow
generated by cgit v1.1 at 2025-02-01 04:10:31 +0000