[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 de683865a3745c5f5db2be1200d8f82729ff5f08
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 19:27:17 2009 +0000

    2009-11-04  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Adam Barth.
    
            DOM Storage runtime flag changes
            https://bugs.webkit.org/show_bug.cgi?id=30602
    
            Part 2/2.
    
            Revert my changes to Settings and instead implement DOM Storage enabling via
            the methods agreed upon in https://bugs.webkit.org/show_bug.cgi?id=30240
    
            This stuff was (intentionally) never exposed to web pages or DRT, so there's no
            LayoutTest visible changes and thus no tests.
    
            * bindings/v8/custom/V8CustomBinding.h:
            * bindings/v8/custom/V8DOMWindowCustom.cpp:
            (WebCore::ACCESSOR_RUNTIME_ENABLER):
            * page/DOMWindow.cpp:
            (WebCore::DOMWindow::sessionStorage):
            * page/DOMWindow.idl:
            * page/Settings.cpp:
            (WebCore::Settings::Settings):
            * page/Settings.h:
            * storage/Storage.cpp:
            (WebCore::Storage::setLocalStorageAvailable):
            (WebCore::Storage::localStorageAvailable):
            (WebCore::Storage::setSessionStorageAvailable):
            (WebCore::Storage::sessionStorageAvailable):
            * storage/Storage.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fbce611..bbcc734 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2009-11-04  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        DOM Storage runtime flag changes
+        https://bugs.webkit.org/show_bug.cgi?id=30602
+
+        Part 2/2.
+
+        Revert my changes to Settings and instead implement DOM Storage enabling via
+        the methods agreed upon in https://bugs.webkit.org/show_bug.cgi?id=30240
+
+        This stuff was (intentionally) never exposed to web pages or DRT, so there's no
+        LayoutTest visible changes and thus no tests.
+
+        * bindings/v8/custom/V8CustomBinding.h:
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::ACCESSOR_RUNTIME_ENABLER):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::sessionStorage):
+        * page/DOMWindow.idl:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        * storage/Storage.cpp:
+        (WebCore::Storage::setLocalStorageAvailable):
+        (WebCore::Storage::localStorageAvailable):
+        (WebCore::Storage::setSessionStorageAvailable):
+        (WebCore::Storage::sessionStorageAvailable):
+        * storage/Storage.h:
+
 2009-11-05  Jian Li  <jianli at chromium.org>
 
         Reviewed by Pavel Feldman.
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