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

Source/WebKit/chromium/src/StorageAreaProxy.h

Index: Source/WebKit/chromium/src/StorageAreaProxy.h
===================================================================
--- Source/WebKit/chromium/src/StorageAreaProxy.h	(revision 117067)
+++ Source/WebKit/chromium/src/StorageAreaProxy.h	(working copy)
@@ -38,7 +38,6 @@
 class Frame;
 class KURL;
 class Page;
-class PageGroup;
 class SecurityOrigin;
 class Storage;
 
@@ -51,22 +50,23 @@
     virtual unsigned length(Frame* sourceFrame) const;
     virtual String key(unsigned index, Frame* sourceFrame) const;
     virtual String getItem(const String& key, Frame* sourceFrame) const;
-    virtual void setItem(const String& key, const String& value, ExceptionCode&, Frame* sourceFrame);
-    virtual void removeItem(const String& key, Frame* sourceFrame);
-    virtual void clear(Frame* sourceFrame);
+    virtual String setItem(const String& key, const String& value, ExceptionCode& ec, Frame* sourceFrame);
+    virtual String removeItem(const String& key, Frame* sourceFrame);
+    virtual bool clear(Frame* sourceFrame);
     virtual bool contains(const String& key, Frame* sourceFrame) const;
 
     virtual bool disabledByPrivateBrowsingInFrame(const Frame*) const { return false; }
 
     static void dispatchLocalStorageEvent(
-            PageGroup*, const String& key, const String& oldValue, const String& newValue,
+            const String& pageGroupName, const String& key, const String& oldValue, const String& newValue,
             SecurityOrigin*, const KURL& pageURL, WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess);
     static void dispatchSessionStorageEvent(
-            PageGroup*, const String& key, const String& oldValue, const String& newValue,
+            const String& pageGroupName, const String& key, const String& oldValue, const String& newValue,
             SecurityOrigin*, const KURL& pageURL, const WebKit::WebStorageNamespace&,
             WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess);
 
 private:
+    void storageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Frame* sourceFrame);
     bool canAccessStorage(Frame*) const;
 
     static bool isEventSource(Storage*, WebKit::WebStorageArea* sourceAreaInstance);