Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (87524 => 87525)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-05-27 17:52:05 UTC (rev 87524)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-05-27 18:11:28 UTC (rev 87525)
@@ -1,3 +1,17 @@
+2011-05-27 Jochen Eisinger <joc...@chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [chromium] drop unused WebFrame parameter to WebStorageArea::setItem
+ https://bugs.webkit.org/show_bug.cgi?id=61583
+
+ * public/WebStorageArea.h:
+ * src/StorageAreaProxy.cpp:
+ (WebCore::StorageAreaProxy::setItem):
+ * src/WebStorageAreaImpl.cpp:
+ (WebKit::WebStorageAreaImpl::setItem):
+ * src/WebStorageAreaImpl.h:
+
2011-05-27 David Levin <le...@chromium.org>
Reviewed by Darin Fisher.
Modified: trunk/Source/WebKit/chromium/public/WebStorageArea.h (87524 => 87525)
--- trunk/Source/WebKit/chromium/public/WebStorageArea.h 2011-05-27 17:52:05 UTC (rev 87524)
+++ trunk/Source/WebKit/chromium/public/WebStorageArea.h 2011-05-27 18:11:28 UTC (rev 87525)
@@ -36,7 +36,6 @@
namespace WebKit {
-class WebFrame;
class WebURL;
// In WebCore, there's one distinct StorageArea per origin per StorageNamespace. This
@@ -66,15 +65,7 @@
// 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. url is the
// url that should be used if a storage event fires.
- virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, Result& result, WebString& oldValue, WebFrame*)
- {
- setItem(key, newValue, url, result, oldValue);
- }
- // FIXME: Remove soon (once Chrome has rolled past this revision).
- virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, Result& result, WebString& oldValue)
- {
- setItem(key, newValue, url, result, oldValue, 0);
- }
+ 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.
Modified: trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp (87524 => 87525)
--- trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp 2011-05-27 17:52:05 UTC (rev 87524)
+++ trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp 2011-05-27 18:11:28 UTC (rev 87525)
@@ -87,7 +87,7 @@
if (webView->permissionClient() && !webView->permissionClient()->allowStorage(webFrame, m_storageType == LocalStorage))
ec = QUOTA_EXCEEDED_ERR;
else {
- m_storageArea->setItem(key, value, frame->document()->url(), result, oldValue, webFrame);
+ m_storageArea->setItem(key, value, frame->document()->url(), result, oldValue);
ec = (result == WebKit::WebStorageArea::ResultOK) ? 0 : QUOTA_EXCEEDED_ERR;
String oldValueString = oldValue;
if (oldValueString != value && result == WebKit::WebStorageArea::ResultOK)
Modified: trunk/Source/WebKit/chromium/src/WebStorageAreaImpl.cpp (87524 => 87525)
--- trunk/Source/WebKit/chromium/src/WebStorageAreaImpl.cpp 2011-05-27 17:52:05 UTC (rev 87524)
+++ trunk/Source/WebKit/chromium/src/WebStorageAreaImpl.cpp 2011-05-27 18:11:28 UTC (rev 87525)
@@ -66,7 +66,7 @@
return m_storageArea->getItem(key);
}
-void WebStorageAreaImpl::setItem(const WebString& key, const WebString& value, const WebURL& url, Result& result, WebString& oldValue, WebFrame*)
+void WebStorageAreaImpl::setItem(const WebString& key, const WebString& value, const WebURL& url, Result& result, WebString& oldValue)
{
int exceptionCode = 0;
Modified: trunk/Source/WebKit/chromium/src/WebStorageAreaImpl.h (87524 => 87525)
--- trunk/Source/WebKit/chromium/src/WebStorageAreaImpl.h 2011-05-27 17:52:05 UTC (rev 87524)
+++ trunk/Source/WebKit/chromium/src/WebStorageAreaImpl.h 2011-05-27 18:11:28 UTC (rev 87525)
@@ -45,7 +45,7 @@
virtual unsigned length();
virtual WebString key(unsigned index);
virtual WebString getItem(const WebString& key);
- virtual void setItem(const WebString& key, const WebString& value, const WebURL& url, Result& result, WebString& oldValue, WebFrame*);
+ virtual void setItem(const WebString& key, const WebString& value, const WebURL&, Result&, WebString& oldValue);
virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue);
virtual void clear(const WebURL& url, bool& somethingCleared);
