Merge webkit.org at r54340 : Initial merge by git

Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44

1 files changed, 4 insertions, 31 deletions

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