Title: [177084] trunk/Source/WebKit2
- Revision
- 177084
- Author
- [email protected]
- Date
- 2014-12-10 11:41:37 -0800 (Wed, 10 Dec 2014)
Log Message
Implement WebStorageNamespaceProvider::createLocalStorageNamespace
https://bugs.webkit.org/show_bug.cgi?id=139498
Reviewed by Beth Dakin.
* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::createLocalStorageNamespace):
Add a new overload that takes an identifier + quota. Have the old overload call the new one.
* WebProcess/Storage/StorageNamespaceImpl.h:
Add new member.
* WebProcess/Storage/WebStorageNamespaceProvider.cpp:
(WebKit::WebStorageNamespaceProvider::createLocalStorageNamespace):
Call StorageNamespaceImpl::createLocalStorageNamespace.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177083 => 177084)
--- trunk/Source/WebKit2/ChangeLog 2014-12-10 19:36:32 UTC (rev 177083)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-10 19:41:37 UTC (rev 177084)
@@ -1,5 +1,23 @@
2014-12-10 Anders Carlsson <[email protected]>
+ Implement WebStorageNamespaceProvider::createLocalStorageNamespace
+ https://bugs.webkit.org/show_bug.cgi?id=139498
+
+ Reviewed by Beth Dakin.
+
+ * WebProcess/Storage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::createLocalStorageNamespace):
+ Add a new overload that takes an identifier + quota. Have the old overload call the new one.
+
+ * WebProcess/Storage/StorageNamespaceImpl.h:
+ Add new member.
+
+ * WebProcess/Storage/WebStorageNamespaceProvider.cpp:
+ (WebKit::WebStorageNamespaceProvider::createLocalStorageNamespace):
+ Call StorageNamespaceImpl::createLocalStorageNamespace.
+
+2014-12-10 Anders Carlsson <[email protected]>
+
Add a stubbed out WebStorageNamespaceProvider class to WebKit2
https://bugs.webkit.org/show_bug.cgi?id=139497
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (177083 => 177084)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-10 19:36:32 UTC (rev 177083)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-10 19:41:37 UTC (rev 177084)
@@ -49,16 +49,13 @@
return localStorageNamespaceMap;
}
-PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(PageGroup* pageGroup)
+PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
{
- uint64_t pageGroupID = WebProcess::shared().webPageGroup(pageGroup)->pageGroupID();
-
- LocalStorageNamespaceMap::AddResult result = localStorageNamespaceMap().add(pageGroupID, nullptr);
+ LocalStorageNamespaceMap::AddResult result = localStorageNamespaceMap().add(identifier, nullptr);
if (!result.isNewEntry)
return result.iterator->value;
- unsigned quota = pageGroup->groupSettings().localStorageQuotaBytes();
- RefPtr<StorageNamespaceImpl> localStorageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, pageGroupID, quota));
+ RefPtr<StorageNamespaceImpl> localStorageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, identifier, quotaInBytes));
result.iterator->value = localStorageNamespace.get();
return localStorageNamespace.release();
@@ -69,6 +66,14 @@
return adoptRef(new StorageNamespaceImpl(SessionStorage, webPage->pageID(), webPage->corePage()->settings().sessionStorageQuota()));
}
+PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(PageGroup* pageGroup)
+{
+ uint64_t pageGroupID = WebProcess::shared().webPageGroup(pageGroup)->pageGroupID();
+ unsigned quota = pageGroup->groupSettings().localStorageQuotaBytes();
+
+ return createLocalStorageNamespace(pageGroupID, quota);
+}
+
StorageNamespaceImpl::StorageNamespaceImpl(WebCore::StorageType storageType, uint64_t storageNamespaceID, unsigned quotaInBytes)
: m_storageType(storageType)
, m_storageNamespaceID(storageNamespaceID)
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177083 => 177084)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-10 19:36:32 UTC (rev 177083)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-10 19:41:37 UTC (rev 177084)
@@ -38,7 +38,7 @@
class StorageNamespaceImpl : public WebCore::StorageNamespace {
public:
- static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(WebCore::PageGroup*);
+ static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
virtual ~StorageNamespaceImpl();
@@ -46,6 +46,9 @@
uint64_t storageNamespaceID() const { return m_storageNamespaceID; }
unsigned quotaInBytes() const { return m_quotaInBytes; }
+ // FIXME: Remove this deprecated overload.
+ static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(WebCore::PageGroup*);
+
private:
explicit StorageNamespaceImpl(WebCore::StorageType, uint64_t storageNamespaceID, unsigned quotaInBytes);
Modified: trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp (177083 => 177084)
--- trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-10 19:36:32 UTC (rev 177083)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-10 19:41:37 UTC (rev 177084)
@@ -26,7 +26,7 @@
#include "config.h"
#include "WebStorageNamespaceProvider.h"
-#include <WebCore/StorageNamespace.h>
+#include "StorageNamespaceImpl.h"
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
@@ -67,8 +67,7 @@
RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace(unsigned quota)
{
- // FIXME: Implement.
- return nullptr;
+ return StorageNamespaceImpl::createLocalStorageNamespace(m_identifier, quota);
}
RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createTransientLocalStorageNamespace(WebCore::SecurityOrigin&, unsigned quota)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
