Revert 116712 - Source/WebCore: [chromium] DomStorage events handling needs TLC (2)

Source/WebKit/chromium/public/WebStorageArea.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #ifndef WebStorageArea_h
 #define WebStorageArea_h
 
 #include "platform/WebCommon.h"
 #include "platform/WebString.h"
 
 namespace WebKit {
 
 class WebURL;
 
+// In WebCore, there's one distinct StorageArea per origin per StorageNamespace. This
+// class wraps a StorageArea.  All the methods have obvious connections to the spec:
+// http://dev.w3.org/html5/webstorage/
 class WebStorageArea {
 public:
     virtual ~WebStorageArea() { }
 
     enum Result {
         ResultOK = 0,
         ResultBlockedByQuota
     };
 
     // The number of key/value pairs in the storage area.
     virtual unsigned length() = 0;
 
     // Get a value for a specific key. Valid key indices are 0 through length() - 1.
     // Indexes may change on any set/removeItem call. Will return null if the index
     // provided is out of range.
     virtual WebString key(unsigned index) = 0;
 
     // Get the value that corresponds to a specific key. This returns null if there is
     // no entry for that key.
     virtual WebString getItem(const WebString& key) = 0;
 
     // Set the value that corresponds to a specific key. Result will either be ResultOK
-    // or some particular error. The value is NOT set when there's an error. |pageUrl| is the
+    // or some particular error. The value is NOT set when there's an error.  url is the
     // url that should be used if a storage event fires.
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& pageUrl, Result& result)
-    {
-        WebString unused;
-        setItem(key, newValue, pageUrl, result, unused);
-    }
+    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL&, Result&, WebString& oldValue) = 0;
 
+    // Remove the value associated with a particular key.  url is the url that should be used
+    // if a storage event fires.
+    virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue) = 0;
 
-    // Remove the value associated with a particular key. |pageUrl| is the url that should be used
-    // if a storage event fires.
-    virtual void removeItem(const WebString& key, const WebURL& pageUrl)
-    {
-        WebString unused;
-        removeItem(key, pageUrl, unused);
-    }
-
-    // Clear all key/value pairs. |pageUrl| is the url that should be used if a storage event fires.
-    virtual void clear(const WebURL& pageUrl)
-    {
-        bool unused;
-        clear(pageUrl, unused);
-    }
-
-    // DEPRECATED - being replaced by the async variants above which do not return oldValues or block until completion.
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL&, Result&, WebString& oldValue) = 0;
-    virtual void removeItem(const WebString& key, const WebURL& pageUrl, WebString& oldValue) = 0;
-    virtual void clear(const WebURL& pageUrl, bool& somethingCleared) = 0;
+    // Clear all key/value pairs.  url is the url that should be used if a storage event fires.
+    virtual void clear(const WebURL& url, bool& somethingCleared) = 0;
 };
 
 } // namespace WebKit
 
 #endif // WebStorageArea_h