Modified: trunk/Source/WebKit2/ChangeLog (140742 => 140743)
--- trunk/Source/WebKit2/ChangeLog 2013-01-24 23:48:55 UTC (rev 140742)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-24 23:54:58 UTC (rev 140743)
@@ -1,3 +1,17 @@
+2013-01-24 Anders Carlsson <[email protected]>
+
+ More StorageAreaProxy cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=107870
+
+ Reviewed by Beth Dakin.
+
+ Remove some unnecessary 'WebCore::' qualifications,
+ and implement StorageNamespaceProxy::storageArea.
+
+ * WebProcess/Storage/StorageAreaProxy.cpp:
+ * WebProcess/Storage/StorageAreaProxy.h:
+ * WebProcess/Storage/StorageNamespaceProxy.cpp:
+
2013-01-24 Sam Weinig <[email protected]>
Cleanup sandbox initialization a bit
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp (140742 => 140743)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-01-24 23:48:55 UTC (rev 140742)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-01-24 23:54:58 UTC (rev 140743)
@@ -26,67 +26,72 @@
#include "config.h"
#include "StorageAreaProxy.h"
+#include <WebCore/SecurityOrigin.h>
+
+using namespace WebCore;
+
namespace WebKit {
-PassRefPtr<StorageAreaProxy> StorageAreaProxy::create()
+PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceProxy* storageNamespaceProxy, PassRefPtr<SecurityOrigin> securityOrigin)
{
- return adoptRef(new StorageAreaProxy);
+ return adoptRef(new StorageAreaProxy(storageNamespaceProxy, securityOrigin));
}
-StorageAreaProxy::StorageAreaProxy()
+StorageAreaProxy::StorageAreaProxy(StorageNamespaceProxy*, PassRefPtr<SecurityOrigin>)
{
+ // FIXME: Implement.
}
StorageAreaProxy::~StorageAreaProxy()
{
}
-unsigned StorageAreaProxy::length(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+unsigned StorageAreaProxy::length(ExceptionCode&, Frame* sourceFrame) const
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
}
-String StorageAreaProxy::key(unsigned index, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+String StorageAreaProxy::key(unsigned index, ExceptionCode&, Frame* sourceFrame) const
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
return String();
}
-String StorageAreaProxy::getItem(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+String StorageAreaProxy::getItem(const String& key, ExceptionCode&, Frame* sourceFrame) const
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
return String();
}
-void StorageAreaProxy::setItem(const String& key, const String& value, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame)
+void StorageAreaProxy::setItem(const String& key, const String& value, ExceptionCode&, Frame* sourceFrame)
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
}
-void StorageAreaProxy::removeItem(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame)
+void StorageAreaProxy::removeItem(const String& key, ExceptionCode&, Frame* sourceFrame)
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
}
-void StorageAreaProxy::clear(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame)
+void StorageAreaProxy::clear(ExceptionCode&, Frame* sourceFrame)
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
}
-bool StorageAreaProxy::contains(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+bool StorageAreaProxy::contains(const String& key, ExceptionCode&, Frame* sourceFrame) const
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
return false;
}
-bool StorageAreaProxy::canAccessStorage(WebCore::Frame*) const
+bool StorageAreaProxy::canAccessStorage(Frame*) const
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h (140742 => 140743)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-01-24 23:48:55 UTC (rev 140742)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-01-24 23:54:58 UTC (rev 140743)
@@ -30,13 +30,15 @@
namespace WebKit {
+class StorageNamespaceProxy;
+
class StorageAreaProxy : public WebCore::StorageArea {
public:
- static PassRefPtr<StorageAreaProxy> create();
+ static PassRefPtr<StorageAreaProxy> create(StorageNamespaceProxy*, PassRefPtr<WebCore::SecurityOrigin>);
virtual ~StorageAreaProxy();
private:
- StorageAreaProxy();
+ StorageAreaProxy(StorageNamespaceProxy*, PassRefPtr<WebCore::SecurityOrigin>);
// WebCore::StorageArea.
virtual unsigned length(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const OVERRIDE;
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp (140742 => 140743)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-01-24 23:48:55 UTC (rev 140742)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-01-24 23:54:58 UTC (rev 140743)
@@ -26,6 +26,9 @@
#include "config.h"
#include "StorageNamespaceProxy.h"
+#include "StorageAreaProxy.h"
+#include <WebCore/SecurityOrigin.h>
+
using namespace WebCore;
namespace WebKit {
@@ -43,14 +46,12 @@
{
}
-PassRefPtr<WebCore::StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<WebCore::SecurityOrigin>)
+PassRefPtr<StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
- return nullptr;
+ return StorageAreaProxy::create(this, securityOrigin);
}
-PassRefPtr<WebCore::StorageNamespace> StorageNamespaceProxy::copy()
+PassRefPtr<StorageNamespace> StorageNamespaceProxy::copy()
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
@@ -63,7 +64,7 @@
ASSERT_NOT_REACHED();
}
-void StorageNamespaceProxy::clearOriginForDeletion(WebCore::SecurityOrigin*)
+void StorageNamespaceProxy::clearOriginForDeletion(SecurityOrigin*)
{
// FIXME: Implement this.
ASSERT_NOT_REACHED();
