[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jorlow at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit e694d9852602113168b5ae1f92f5ff9436c84809
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 10 20:52:57 2009 +0000

    2009-11-09  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Remove session storage setting
            https://bugs.webkit.org/show_bug.cgi?id=31279
    
            Remove session storage from Settings.  It was added temporarily so we could
            disable it by default at runtime in Chromium.  We now disable these things in a
            different way, so it's time to remove it.  Qt also depended on this setting for
            a short period of time, but after talking to them we agreed that it should be
            removed.
    
            This bug is the second half of https://bugs.webkit.org/show_bug.cgi?id=30602
    
            * page/DOMWindow.cpp:
            (WebCore::DOMWindow::sessionStorage):
            * page/Settings.cpp:
            (WebCore::Settings::Settings):
            * page/Settings.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50754 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 09e7ec8..15e4ccd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2009-11-09  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove session storage setting
+        https://bugs.webkit.org/show_bug.cgi?id=31279
+
+        Remove session storage from Settings.  It was added temporarily so we could
+        disable it by default at runtime in Chromium.  We now disable these things in a
+        different way, so it's time to remove it.  Qt also depended on this setting for
+        a short period of time, but after talking to them we agreed that it should be
+        removed.
+
+        This bug is the second half of https://bugs.webkit.org/show_bug.cgi?id=30602
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::sessionStorage):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+
 2009-11-10  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Eric Carlson and Darin Adler.
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index ef4ee5f..f08427e 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -574,9 +574,6 @@ 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 48f310b..c57c56d 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -72,7 +72,6 @@ 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)
@@ -256,11 +255,6 @@ 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 bdb07b9..fcc914a 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -125,9 +125,6 @@ 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; }
 
@@ -307,7 +304,6 @@ 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