Title: [177420] trunk/Source/WebKit2
- Revision
- 177420
- Author
- ander...@apple.com
- Date
- 2014-12-16 17:39:25 -0800 (Tue, 16 Dec 2014)
Log Message
Remove deprecated StorageNamespaceImpl overloads
https://bugs.webkit.org/show_bug.cgi?id=139713
Reviewed by Andreas Kling.
* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::storageArea):
(WebKit::StorageNamespaceImpl::copy):
(WebKit::StorageNamespaceImpl::createSessionStorageNamespace): Deleted.
(WebKit::StorageNamespaceImpl::createLocalStorageNamespace): Deleted.
* WebProcess/Storage/StorageNamespaceImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177419 => 177420)
--- trunk/Source/WebKit2/ChangeLog 2014-12-17 01:38:48 UTC (rev 177419)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-17 01:39:25 UTC (rev 177420)
@@ -1,3 +1,17 @@
+2014-12-16 Anders Carlsson <ander...@apple.com>
+
+ Remove deprecated StorageNamespaceImpl overloads
+ https://bugs.webkit.org/show_bug.cgi?id=139713
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/Storage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::storageArea):
+ (WebKit::StorageNamespaceImpl::copy):
+ (WebKit::StorageNamespaceImpl::createSessionStorageNamespace): Deleted.
+ (WebKit::StorageNamespaceImpl::createLocalStorageNamespace): Deleted.
+ * WebProcess/Storage/StorageNamespaceImpl.h:
+
2014-12-16 Beth Dakin <bda...@apple.com>
Speculative build fix.
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (177419 => 177420)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-17 01:38:48 UTC (rev 177419)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-17 01:39:25 UTC (rev 177420)
@@ -56,19 +56,6 @@
return adoptRef(new StorageNamespaceImpl(LocalStorage, identifier, &topLevelOrigin, quotaInBytes));
}
-PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(WebPage* webPage)
-{
- return createSessionStorageNamespace(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, WebCore::SecurityOrigin* topLevelOrigin, unsigned quotaInBytes)
: m_storageType(storageType)
, m_storageNamespaceID(storageNamespaceID)
@@ -83,18 +70,18 @@
PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
{
- auto result = m_storageAreaMaps.add(securityOrigin.get(), nullptr);
- if (result.isNewEntry)
- result.iterator->value = StorageAreaMap::create(this, securityOrigin);
+ auto& slot = m_storageAreaMaps.add(securityOrigin.get(), nullptr).iterator->value;
+ if (!slot)
+ slot = StorageAreaMap::create(this, securityOrigin);
- return StorageAreaImpl::create(result.iterator->value);
+ return StorageAreaImpl::create(slot);
}
PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy(Page* newPage)
{
ASSERT(m_storageNamespaceID);
- return createSessionStorageNamespace(WebPage::fromCorePage(newPage));
+ return createSessionStorageNamespace(WebPage::fromCorePage(newPage)->pageID(), m_quotaInBytes);
}
void StorageNamespaceImpl::close()
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177419 => 177420)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-17 01:38:48 UTC (rev 177419)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-17 01:39:25 UTC (rev 177420)
@@ -49,10 +49,6 @@
WebCore::SecurityOrigin* topLevelOrigin() const { return m_topLevelOrigin.get(); }
unsigned quotaInBytes() const { return m_quotaInBytes; }
- // FIXME: Remove this deprecated overload.
- static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(WebCore::PageGroup*);
- static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
-
private:
explicit StorageNamespaceImpl(WebCore::StorageType, uint64_t storageNamespaceID, WebCore::SecurityOrigin* topLevelOrigin, unsigned quotaInBytes);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
