diff options
Diffstat (limited to 'WebCore/storage/StorageNamespaceImpl.cpp')
| -rw-r--r-- | WebCore/storage/StorageNamespaceImpl.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/storage/StorageNamespaceImpl.cpp b/WebCore/storage/StorageNamespaceImpl.cpp index 19ff6b4..b505d1d 100644 --- a/WebCore/storage/StorageNamespaceImpl.cpp +++ b/WebCore/storage/StorageNamespaceImpl.cpp @@ -58,9 +58,9 @@ PassRefPtr<StorageNamespace> StorageNamespaceImpl::localStorageNamespace(const S return it->second; } -PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace() +PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace(unsigned quota) { - return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), StorageMap::noQuota)); + return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), quota)); } StorageNamespaceImpl::StorageNamespaceImpl(StorageType storageType, const String& path, unsigned quota) @@ -119,7 +119,9 @@ PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOri void StorageNamespaceImpl::close() { ASSERT(isMainThread()); - ASSERT(!m_isShutdown); + + if (m_isShutdown) + return; // If we're session storage, we shouldn't need to do any work here. if (m_storageType == SessionStorage) { |