Enable the URL portion of storage events. This is mostly just plumbing + a hack for making them work in test shell and single process mode.

This replaces http://codereview.chromium.org/335034/show

TEST=none
BUG=24581

Review URL: http://codereview.chromium.org/363014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31081 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 6 deletions

diff --git a/webkit/api/src/WebStorageAreaImpl.cpp b/webkit/api/src/WebStorageAreaImpl.cpp
index c835424..4e46f54 100644
--- a/webkit/api/src/WebStorageAreaImpl.cpp
+++ b/webkit/api/src/WebStorageAreaImpl.cpp
@@ -34,10 +34,14 @@
 #if ENABLE(DOM_STORAGE)
 
 #include "ExceptionCode.h"
+
 #include "WebString.h"
+#include "WebURL.h"
 
 namespace WebKit {
 
+const WebURL* WebStorageAreaImpl::storageEventURL = NULL;
+
 WebStorageAreaImpl::WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea)
     : m_storageArea(storageArea)
 {
@@ -62,11 +66,13 @@ WebString WebStorageAreaImpl::getItem(const WebString& key)
     return m_storageArea->getItem(key);
 }
 
-void WebStorageAreaImpl::setItem(const WebString& key, const WebString& value, bool& quotaException)
+void WebStorageAreaImpl::setItem(const WebString& key, const WebString& value, const WebURL& url, bool& quotaException)
 {
     int exceptionCode = 0;
-    // FIXME: Can we do any better than just passing 0 for the frame?
+
+    ScopedStorageEventURL scope(url);
     m_storageArea->setItem(key, value, exceptionCode, 0);
+
     if (exceptionCode != 0) {
         ASSERT(exceptionCode == WebCore::QUOTA_EXCEEDED_ERR);
         quotaException = true;
@@ -75,15 +81,15 @@ void WebStorageAreaImpl::setItem(const WebString& key, const WebString& value, b
     }
 }
 
-void WebStorageAreaImpl::removeItem(const WebString& key)
+void WebStorageAreaImpl::removeItem(const WebString& key, const WebURL& url)
 {
-    // FIXME: Can we do any better than just passing 0 for the frame?
+    ScopedStorageEventURL scope(url);
     m_storageArea->removeItem(key, 0);
 }
 
-void WebStorageAreaImpl::clear()
+void WebStorageAreaImpl::clear(const WebURL& url)
 {
-    // FIXME: Can we do any better than just passing 0 for the frame?
+    ScopedStorageEventURL scope(url);
     m_storageArea->clear(0);
 }