[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 b2fe3bed42dbffcb07f167f43d6f7fed344e0422
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 26 23:44:49 2009 +0000

    2009-10-26  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [V8] Tidy up the DOM Storage runtime flag stuff
            https://bugs.webkit.org/show_bug.cgi?id=30794
    
            Clean up the DOM Storage runtime flag stuff to match the new way of doing
            things.  No behavioral changes.
    
            * bindings/v8/RuntimeEnabledFeatures.cpp:
            * bindings/v8/RuntimeEnabledFeatures.h:
            (WebCore::RuntimeEnabledFeatures::setDatabaseEnabled):
            (WebCore::RuntimeEnabledFeatures::databaseEnabled):
            (WebCore::RuntimeEnabledFeatures::setLocalStorageEnabled):
            (WebCore::RuntimeEnabledFeatures::localStorageEnabled):
            (WebCore::RuntimeEnabledFeatures::setSessionStorageEnabled):
            (WebCore::RuntimeEnabledFeatures::sessionStorageEnabled):
            * bindings/v8/custom/V8DOMWindowCustom.cpp:
            (WebCore::ACCESSOR_RUNTIME_ENABLER):
            * storage/Storage.cpp:
            * storage/Storage.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 415bec8..335f10d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2009-10-26  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [V8] Tidy up the DOM Storage runtime flag stuff
+        https://bugs.webkit.org/show_bug.cgi?id=30794
+
+        Clean up the DOM Storage runtime flag stuff to match the new way of doing
+        things.  No behavioral changes.
+
+        * bindings/v8/RuntimeEnabledFeatures.cpp:
+        * bindings/v8/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setDatabaseEnabled):
+        (WebCore::RuntimeEnabledFeatures::databaseEnabled):
+        (WebCore::RuntimeEnabledFeatures::setLocalStorageEnabled):
+        (WebCore::RuntimeEnabledFeatures::localStorageEnabled):
+        (WebCore::RuntimeEnabledFeatures::setSessionStorageEnabled):
+        (WebCore::RuntimeEnabledFeatures::sessionStorageEnabled):
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::ACCESSOR_RUNTIME_ENABLER):
+        * storage/Storage.cpp:
+        * storage/Storage.h:
+
 2009-10-26  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp b/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
index 3dd7ad6..43db6f0 100644
--- a/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
@@ -34,5 +34,7 @@
 namespace WebCore {
 
 bool RuntimeEnabledFeatures::isDatabaseEnabled = false;
+bool RuntimeEnabledFeatures::isLocalStorageEnabled = false;
+bool RuntimeEnabledFeatures::isSessionStorageEnabled = false;
 
 } // namespace WebCore
diff --git a/WebCore/bindings/v8/RuntimeEnabledFeatures.h b/WebCore/bindings/v8/RuntimeEnabledFeatures.h
index 87419e8..fa42024 100644
--- a/WebCore/bindings/v8/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/v8/RuntimeEnabledFeatures.h
@@ -39,10 +39,19 @@ public:
     static void setDatabaseEnabled(bool isEnabled) { isDatabaseEnabled = isEnabled; }
     static bool databaseEnabled() { return isDatabaseEnabled; }
 
+    static void setLocalStorageEnabled(bool isEnabled) { isLocalStorageEnabled = isEnabled; }
+    static bool localStorageEnabled() { return isLocalStorageEnabled; }
+
+    static void setSessionStorageEnabled(bool isEnabled) { isSessionStorageEnabled = isEnabled; }
+    static bool sessionStorageEnabled() { return isSessionStorageEnabled; }
+
 private:
+    // Never instantiate.
     RuntimeEnabledFeatures() { }
 
     static bool isDatabaseEnabled;
+    static bool isLocalStorageEnabled;
+    static bool isSessionStorageEnabled;
 };
 
 } // namespace WebCore
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
index bd165ef..7eccfb1 100644
--- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -292,12 +292,12 @@ ACCESSOR_RUNTIME_ENABLER(DOMWindowOpenDatabase)
 #if ENABLE(DOM_STORAGE)
 ACCESSOR_RUNTIME_ENABLER(DOMWindowLocalStorage)
 {
-    return Storage::localStorageAvailable();
+    return RuntimeEnabledFeatures::localStorageEnabled();
 }
 
 ACCESSOR_RUNTIME_ENABLER(DOMWindowSessionStorage)
 {
-    return Storage::sessionStorageAvailable();
+    return RuntimeEnabledFeatures::sessionStorageEnabled();
 }
 #endif
 
diff --git a/WebCore/storage/Storage.cpp b/WebCore/storage/Storage.cpp
index 28a55ad..0a8eed7 100644
--- a/WebCore/storage/Storage.cpp
+++ b/WebCore/storage/Storage.cpp
@@ -34,32 +34,6 @@
 
 namespace WebCore {
 
-#if USE(V8)
-// FIXME: Remove once these features are turned on by default in Chromium.
-static bool s_localStorageAvailable = true;
-static bool s_sessionStorageAvailable = true;
-
-void Storage::setLocalStorageAvailable(bool available)
-{
-    s_localStorageAvailable = available;
-}
-
-bool Storage::localStorageAvailable()
-{
-    return s_localStorageAvailable;
-}
-
-void Storage::setSessionStorageAvailable(bool available)
-{
-    s_sessionStorageAvailable = available;
-}
-
-bool Storage::sessionStorageAvailable()
-{
-    return s_sessionStorageAvailable;
-}
-#endif
-
 PassRefPtr<Storage> Storage::create(Frame* frame, PassRefPtr<StorageArea> storageArea)
 {
     return adoptRef(new Storage(frame, storageArea));
diff --git a/WebCore/storage/Storage.h b/WebCore/storage/Storage.h
index 762688f..06cc97b 100644
--- a/WebCore/storage/Storage.h
+++ b/WebCore/storage/Storage.h
@@ -44,13 +44,6 @@ namespace WebCore {
         static PassRefPtr<Storage> create(Frame*, PassRefPtr<StorageArea>);
         ~Storage();
 
-#if USE(V8)
-        static void setLocalStorageAvailable(bool);
-        static bool localStorageAvailable();
-        static void setSessionStorageAvailable(bool);
-        static bool sessionStorageAvailable();
-#endif
-
         unsigned length() const;
         String key(unsigned index) const;
         String getItem(const String&) const;

-- 
WebKit Debian packaging