Diff
Modified: trunk/Source/WebKit2/ChangeLog (148146 => 148147)
--- trunk/Source/WebKit2/ChangeLog 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-10 23:21:59 UTC (rev 148147)
@@ -1,3 +1,20 @@
+2013-04-10 Anders Carlsson <[email protected]>
+
+ Rename StorageNamespaceProxy to StorageNamespaceImpl.
+
+ Rubber-stamped by Beth Dakin.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Storage/StorageAreaProxy.cpp:
+ (WebKit::StorageAreaProxy::create):
+ (WebKit::StorageAreaProxy::StorageAreaProxy):
+ * WebProcess/Storage/StorageAreaProxy.h:
+ (StorageAreaProxy):
+ * WebProcess/Storage/StorageNamespaceImpl.cpp: Renamed from Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp.
+ * WebProcess/Storage/StorageNamespaceImpl.h: Renamed from Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::sessionStorageNamespace):
+
2013-04-10 Tim Horton <[email protected]>
[wk2] Un-pollute TCADA methods with "PageOverlayLayerMap::iterator end"
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (148146 => 148147)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-04-10 23:21:59 UTC (rev 148147)
@@ -137,7 +137,7 @@
1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */; };
1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
- 1A44B95716B737AA00B7BBD8 /* StorageNamespaceProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */; };
+ 1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */; };
1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */; };
1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */; };
1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9AA612B7E796008FE984 /* WKTextInputWindowController.h */; };
@@ -1433,8 +1433,8 @@
1A119A94127B796200A9ECB1 /* MessageSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageSender.h; sourceTree = "<group>"; };
1A13BEB11635A9C800F19C03 /* StringReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringReference.cpp; sourceTree = "<group>"; };
1A13BEB21635A9C800F19C03 /* StringReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringReference.h; sourceTree = "<group>"; };
- 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceProxy.cpp; sourceTree = "<group>"; };
- 1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceProxy.h; sourceTree = "<group>"; };
+ 1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
+ 1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; };
1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginCreationParameters.cpp; sourceTree = "<group>"; };
1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginCreationParameters.h; sourceTree = "<group>"; };
1A186EE812EF7618008E5F37 /* LayerTreeHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeHost.h; sourceTree = "<group>"; };
@@ -3092,8 +3092,8 @@
1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */,
1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */,
1A334DEA16DE8B68006A8E38 /* StorageAreaProxy.messages.in */,
- 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */,
- 1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */,
+ 1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */,
+ 1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */,
1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */,
1AAC4DE316B1CBF6009425E3 /* WebKeyValueStorageManager.messages.in */,
@@ -6560,7 +6560,7 @@
1AD3306E16B1D991004F60E7 /* StorageAreaProxy.cpp in Sources */,
1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */,
1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */,
- 1A44B95716B737AA00B7BBD8 /* StorageNamespaceProxy.cpp in Sources */,
+ 1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */,
1A13BEB31635A9C800F19C03 /* StringReference.cpp in Sources */,
296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
51815B9F16A622210054501F /* SyncNetworkResourceLoader.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp (148146 => 148147)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-04-10 23:21:59 UTC (rev 148147)
@@ -29,7 +29,7 @@
#include "SecurityOriginData.h"
#include "StorageAreaProxyMessages.h"
#include "StorageManagerMessages.h"
-#include "StorageNamespaceProxy.h"
+#include "StorageNamespaceImpl.h"
#include "WebProcess.h"
#include <WebCore/ExceptionCode.h>
#include <WebCore/Frame.h>
@@ -48,18 +48,18 @@
return ++storageAreaID;
}
-PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceProxy* storageNamespaceProxy, PassRefPtr<SecurityOrigin> securityOrigin)
+PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
{
- return adoptRef(new StorageAreaProxy(storageNamespaceProxy, securityOrigin));
+ return adoptRef(new StorageAreaProxy(StorageNamespaceImpl, securityOrigin));
}
-StorageAreaProxy::StorageAreaProxy(StorageNamespaceProxy* storageNamespaceProxy, PassRefPtr<SecurityOrigin> securityOrigin)
- : m_storageNamespaceID(storageNamespaceProxy->storageNamespaceID())
- , m_quotaInBytes(storageNamespaceProxy->quotaInBytes())
+StorageAreaProxy::StorageAreaProxy(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
+ : m_storageNamespaceID(StorageNamespaceImpl->storageNamespaceID())
+ , m_quotaInBytes(StorageNamespaceImpl->quotaInBytes())
, m_storageAreaID(generateStorageAreaID())
, m_securityOrigin(securityOrigin)
{
- WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, storageNamespaceProxy->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
+ WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, StorageNamespaceImpl->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
WebProcess::shared().addMessageReceiver(Messages::StorageAreaProxy::messageReceiverName(), m_storageAreaID, this);
}
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h (148146 => 148147)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-04-10 23:21:59 UTC (rev 148147)
@@ -37,15 +37,15 @@
namespace WebKit {
-class StorageNamespaceProxy;
+class StorageNamespaceImpl;
class StorageAreaProxy : public WebCore::StorageArea, private CoreIPC::MessageReceiver {
public:
- static PassRefPtr<StorageAreaProxy> create(StorageNamespaceProxy*, PassRefPtr<WebCore::SecurityOrigin>);
+ static PassRefPtr<StorageAreaProxy> create(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
virtual ~StorageAreaProxy();
private:
- StorageAreaProxy(StorageNamespaceProxy*, PassRefPtr<WebCore::SecurityOrigin>);
+ StorageAreaProxy(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
// WebCore::StorageArea.
virtual unsigned length(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) OVERRIDE;
Copied: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (from rev 148146, trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp) (0 => 148147)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2013-04-10 23:21:59 UTC (rev 148147)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2013 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "StorageNamespaceImpl.h"
+
+#include "StorageAreaProxy.h"
+#include "WebPage.h"
+#include <WebCore/SecurityOrigin.h>
+#include <WebCore/Settings.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(WebPage* webPage)
+{
+ return adoptRef(new StorageNamespaceImpl(webPage->pageID(), webPage->corePage()->settings()->sessionStorageQuota()));
+}
+
+StorageNamespaceImpl::StorageNamespaceImpl(uint64_t storageNamespaceID, unsigned quotaInBytes)
+ : m_storageNamespaceID(storageNamespaceID)
+ , m_quotaInBytes(quotaInBytes)
+{
+}
+
+StorageNamespaceImpl::~StorageNamespaceImpl()
+{
+}
+
+PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
+{
+ HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> >::AddResult result = m_storageAreaMap.add(securityOrigin.get(), 0);
+ if (result.isNewEntry)
+ result.iterator->value = StorageAreaProxy::create(this, securityOrigin);
+
+ return result.iterator->value;
+}
+
+PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+void StorageNamespaceImpl::close()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceImpl::clearOriginForDeletion(SecurityOrigin*)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceImpl::clearAllOriginsForDeletion()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceImpl::sync()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceImpl::closeIdleLocalStorageDatabases()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (from rev 148146, trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h) (0 => 148147)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2013-04-10 23:21:59 UTC (rev 148147)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2013 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef StorageNamespaceImpl_h
+#define StorageNamespaceImpl_h
+
+#include <WebCore/SecurityOriginHash.h>
+#include <WebCore/StorageArea.h>
+#include <WebCore/StorageNamespace.h>
+#include <wtf/HashMap.h>
+
+namespace WebKit {
+
+class StorageAreaProxy;
+class WebPage;
+
+class StorageNamespaceImpl : public WebCore::StorageNamespace {
+public:
+ static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
+ virtual ~StorageNamespaceImpl();
+
+ uint64_t storageNamespaceID() const { return m_storageNamespaceID; }
+ unsigned quotaInBytes() const { return m_quotaInBytes; }
+
+private:
+ explicit StorageNamespaceImpl(uint64_t storageNamespaceID, unsigned quotaInBytes);
+
+ virtual PassRefPtr<WebCore::StorageArea> storageArea(PassRefPtr<WebCore::SecurityOrigin>) OVERRIDE;
+ virtual PassRefPtr<WebCore::StorageNamespace> copy() OVERRIDE;
+ virtual void close() OVERRIDE;
+ virtual void clearOriginForDeletion(WebCore::SecurityOrigin*) OVERRIDE;
+ virtual void clearAllOriginsForDeletion() OVERRIDE;
+ virtual void sync() OVERRIDE;
+ virtual void closeIdleLocalStorageDatabases() OVERRIDE;
+
+ uint64_t m_storageNamespaceID;
+ unsigned m_quotaInBytes;
+
+ HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> > m_storageAreaMap;
+};
+
+} // namespace WebKit
+
+#endif // StorageNamespaceImpl_h
Deleted: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp (148146 => 148147)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-04-10 23:21:59 UTC (rev 148147)
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "StorageNamespaceProxy.h"
-
-#include "StorageAreaProxy.h"
-#include "WebPage.h"
-#include <WebCore/SecurityOrigin.h>
-#include <WebCore/Settings.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-PassRefPtr<StorageNamespaceProxy> StorageNamespaceProxy::createSessionStorageNamespace(WebPage* webPage)
-{
- return adoptRef(new StorageNamespaceProxy(webPage->pageID(), webPage->corePage()->settings()->sessionStorageQuota()));
-}
-
-StorageNamespaceProxy::StorageNamespaceProxy(uint64_t storageNamespaceID, unsigned quotaInBytes)
- : m_storageNamespaceID(storageNamespaceID)
- , m_quotaInBytes(quotaInBytes)
-{
-}
-
-StorageNamespaceProxy::~StorageNamespaceProxy()
-{
-}
-
-PassRefPtr<StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
-{
- HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> >::AddResult result = m_storageAreaMap.add(securityOrigin.get(), 0);
- if (result.isNewEntry)
- result.iterator->value = StorageAreaProxy::create(this, securityOrigin);
-
- return result.iterator->value;
-}
-
-PassRefPtr<StorageNamespace> StorageNamespaceProxy::copy()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-void StorageNamespaceProxy::close()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceProxy::clearOriginForDeletion(SecurityOrigin*)
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceProxy::clearAllOriginsForDeletion()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceProxy::sync()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceProxy::closeIdleLocalStorageDatabases()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h (148146 => 148147)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h 2013-04-10 23:21:59 UTC (rev 148147)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef StorageNamespaceProxy_h
-#define StorageNamespaceProxy_h
-
-#include <WebCore/SecurityOriginHash.h>
-#include <WebCore/StorageArea.h>
-#include <WebCore/StorageNamespace.h>
-#include <wtf/HashMap.h>
-
-namespace WebKit {
-
-class StorageAreaProxy;
-class WebPage;
-
-class StorageNamespaceProxy : public WebCore::StorageNamespace {
-public:
- static PassRefPtr<StorageNamespaceProxy> createSessionStorageNamespace(WebPage*);
- virtual ~StorageNamespaceProxy();
-
- uint64_t storageNamespaceID() const { return m_storageNamespaceID; }
- unsigned quotaInBytes() const { return m_quotaInBytes; }
-
-private:
- explicit StorageNamespaceProxy(uint64_t storageNamespaceID, unsigned quotaInBytes);
-
- virtual PassRefPtr<WebCore::StorageArea> storageArea(PassRefPtr<WebCore::SecurityOrigin>) OVERRIDE;
- virtual PassRefPtr<WebCore::StorageNamespace> copy() OVERRIDE;
- virtual void close() OVERRIDE;
- virtual void clearOriginForDeletion(WebCore::SecurityOrigin*) OVERRIDE;
- virtual void clearAllOriginsForDeletion() OVERRIDE;
- virtual void sync() OVERRIDE;
- virtual void closeIdleLocalStorageDatabases() OVERRIDE;
-
- uint64_t m_storageNamespaceID;
- unsigned m_quotaInBytes;
-
- HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> > m_storageAreaMap;
-};
-
-} // namespace WebKit
-
-#endif // StorageNamespaceProxy_h
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (148146 => 148147)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2013-04-10 23:11:24 UTC (rev 148146)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2013-04-10 23:21:59 UTC (rev 148147)
@@ -32,7 +32,7 @@
#include "DataReference.h"
#include "NetworkResourceLoadParameters.h"
#include "PluginInfoStore.h"
-#include "StorageNamespaceProxy.h"
+#include "StorageNamespaceImpl.h"
#include "WebContextMessages.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
@@ -306,7 +306,7 @@
PassRefPtr<StorageNamespace> WebPlatformStrategies::sessionStorageNamespace(Page* page, unsigned quota)
{
#if ENABLE(UI_PROCESS_STORAGE)
- return StorageNamespaceProxy::createSessionStorageNamespace(WebPage::fromCorePage(page));
+ return StorageNamespaceImpl::createSessionStorageNamespace(WebPage::fromCorePage(page));
#else
return StorageStrategy::sessionStorageNamespace(page, quota);
#endif
