[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[jorlow at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0f5b0ca98c03946a9ccd702f026c940aa36c0f00
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 02:43:01 2010 +0000

    2010-01-27  Matt Perry  <mpcomplete at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Add support for addUserScript to chromium port.
    
            * public/WebView.h:
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::addUserScript):
            (WebKit::WebViewImpl::removeAllUserContent):
            * src/WebViewImpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3ea348c..a10f213 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -39,6 +39,17 @@
 
 2010-01-29  Jeremy Orlow  <jorlow at chromium.org>
 
+        Reviewed by Eric Seidel.
+
+        [Chromium] Clean up WebStorageArea
+        https://bugs.webkit.org/show_bug.cgi?id=34353
+
+        Get rid of legacy glue code and fix a typo.
+
+        * public/WebStorageArea.h:
+
+2010-01-29  Jeremy Orlow  <jorlow at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         A first step towards the Indexed Database API
diff --git a/WebKit/chromium/public/WebStorageArea.h b/WebKit/chromium/public/WebStorageArea.h
index 302e10c..19d98c6 100644
--- a/WebKit/chromium/public/WebStorageArea.h
+++ b/WebKit/chromium/public/WebStorageArea.h
@@ -57,44 +57,17 @@ public:
     // no entry for that key.
     virtual WebString getItem(const WebString& key) = 0;
 
-    // Set the value that corresponds to a specific key. QuotaException is set if we've
+    // Set the value that corresponds to a specific key. QuotaException is set if
     // the StorageArea would have exceeded its quota. The value is NOT set when there's
     // an exception.  url is the url that should be used if a storage event fires.
-    // FIXME: The following is a hack to keep Chromium compiling until the other half is landed.  Remove soon.
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException) // Deprecated.
-    {
-        WebString oldValue;
-        setItem(key, newValue, url, quotaException, oldValue);
-    }
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException, WebString& oldValue)
-    {
-        setItem(key, newValue, url, quotaException);
-    }
+    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException, WebString& oldValue) = 0;
 
     // Remove the value associated with a particular key.  url is the url that should be used
     // if a storage event fires.
-    // FIXME: The following is a hack to keep Chromium compiling until the other half is landed.  Remove soon.
-    virtual void removeItem(const WebString& key, const WebURL& url) // Deprecated.
-    {
-        WebString oldValue;
-        removeItem(key, url, oldValue);
-    }
-    virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue)
-    {
-        removeItem(key, url);
-    }
+    virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue) = 0;
 
     // Clear all key/value pairs.  url is the url that should be used if a storage event fires.
-    // FIXME: The following is a hack to keep Chromium compiling until the other half is landed.  Remove soon.
-    virtual void clear(const WebURL& url) // Deprecated.
-    {
-        bool somethingCleared;
-        clear(url, somethingCleared);
-    }
-    virtual void clear(const WebURL& url, bool& somethingCleared)
-    {
-        clear(url);
-    }
+    virtual void clear(const WebURL& url, bool& somethingCleared) = 0;
 };
 
 } // namespace WebKit

-- 
WebKit Debian packaging