[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
jorlow at chromium.org
jorlow at chromium.org
Thu Dec 3 13:28:00 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 958b217ffabb83ec7f2bd7b8a94dd73437622966
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 5 20:42:50 2009 +0000
Revert 50569 since it broke QT. Build fix and just a revert, so no review.
Patch by Jeremy Orlow <jorlow at chromium.org> on 2009-11-05
* page/DOMWindow.cpp:
(WebCore::DOMWindow::sessionStorage):
* page/Settings.cpp:
(WebCore::Settings::Settings):
(WebCore::Settings::setSessionStorageEnabled):
* page/Settings.h:
(WebCore::Settings::sessionStorageEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50575 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2946967..d45d779 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-05 Jeremy Orlow <jorlow at chromium.org>
+
+ Revert 50569 since it broke QT. Build fix and just a revert, so no review.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::sessionStorage):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setSessionStorageEnabled):
+ * page/Settings.h:
+ (WebCore::Settings::sessionStorageEnabled):
+
2009-11-05 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index f08427e..ef4ee5f 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -574,6 +574,9 @@ Storage* DOMWindow::sessionStorage() const
if (!page)
return 0;
+ if (!page->settings()->sessionStorageEnabled())
+ return 0;
+
RefPtr<StorageArea> storageArea = page->sessionStorage()->storageArea(document->securityOrigin());
#if ENABLE(INSPECTOR)
page->inspectorController()->didUseDOMStorage(storageArea.get(), false, m_frame);
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index c57c56d..48f310b 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -72,6 +72,7 @@ Settings::Settings(Page* page)
, m_arePluginsEnabled(false)
, m_databasesEnabled(false)
, m_localStorageEnabled(false)
+ , m_sessionStorageEnabled(true)
, m_isJavaScriptEnabled(false)
, m_isWebSecurityEnabled(true)
, m_allowUniversalAccessFromFileURLs(true)
@@ -255,6 +256,11 @@ void Settings::setLocalStorageEnabled(bool localStorageEnabled)
m_localStorageEnabled = localStorageEnabled;
}
+void Settings::setSessionStorageEnabled(bool sessionStorageEnabled)
+{
+ m_sessionStorageEnabled = sessionStorageEnabled;
+}
+
void Settings::setLocalStorageQuota(unsigned localStorageQuota)
{
m_localStorageQuota = localStorageQuota;
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index fcc914a..bdb07b9 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -125,6 +125,9 @@ namespace WebCore {
void setLocalStorageEnabled(bool);
bool localStorageEnabled() const { return m_localStorageEnabled; }
+ void setSessionStorageEnabled(bool);
+ bool sessionStorageEnabled() const { return m_sessionStorageEnabled; }
+
void setLocalStorageQuota(unsigned);
unsigned localStorageQuota() const { return m_localStorageQuota; }
@@ -304,6 +307,7 @@ namespace WebCore {
bool m_arePluginsEnabled : 1;
bool m_databasesEnabled : 1;
bool m_localStorageEnabled : 1;
+ bool m_sessionStorageEnabled : 1;
bool m_isJavaScriptEnabled : 1;
bool m_isWebSecurityEnabled : 1;
bool m_allowUniversalAccessFromFileURLs: 1;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list