Dom Storage (webkit side)

storage/StorageNamespaceImpl.cpp

 /*
  * Copyright (C) 2008 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
@@ skipping 10 matching lines @@
  * 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"
 
 #if ENABLE(DOM_STORAGE)
 
+#include "StorageAreaImpl.h"
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 
 typedef HashMap<String, StorageNamespace*> LocalStorageNamespaceMap;
 
 static LocalStorageNamespaceMap& localStorageNamespaceMap()
 {
     DEFINE_STATIC_LOCAL(LocalStorageNamespaceMap, localStorageNamespaceMap, ());
     return localStorageNamespaceMap;

[michaeln, 2009/07/14 19:02:05]

So... incognito vs regular local storage will be distinquished by different
'paths'... is that right?

[jorlow, 2009/07/14 19:12:50]

Yup.

 }
 
 PassRefPtr<StorageNamespace> StorageNamespaceImpl::localStorageNamespace(const String& path)
 {
     const String lookupPath = path.isNull() ? String("") : path;
     LocalStorageNamespaceMap::iterator it = localStorageNamespaceMap().find(lookupPath);
     if (it == localStorageNamespaceMap().end()) {
         RefPtr<StorageNamespace> storageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, lookupPath));
         localStorageNamespaceMap().set(lookupPath, storageNamespace.get());
         return storageNamespace.release();
@@ skipping 27 matching lines @@
         ASSERT(localStorageNamespaceMap().get(m_path) == this);
         localStorageNamespaceMap().remove(m_path);
     }
 }
 
 PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy()
 {
     ASSERT(isMainThread());
     ASSERT(!m_isShutdown);
 
     StorageNamespaceImpl* newNamespace = new StorageNamespaceImpl(m_storageType, m_path);

[michaeln, 2009/07/14 19:02:05]

I think this method is not valid to call on 'local' storage instance. If the
clone where to be made here, the ASSERT on line 79 would fire upon destruction.

If that's correct... maybe

ASSERT(m_storageType == SessionStorage);
newNamespace = new StorageNamespaceImpl(SessionStorage, String());

[jorlow, 2009/07/14 19:12:50]

Makes sense.

 
     StorageAreaMap::iterator end = m_storageAreaMap.end();
     for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i) {
         RefPtr<StorageArea> areaCopy = i->second->copy(i->first.get());
         newNamespace->m_storageAreaMap.set(i->first, areaCopy.release());
     }
 
     return adoptRef(newNamespace);
 }
 
 PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(SecurityOrigin* origin)
 {
     ASSERT(isMainThread());
     ASSERT(!m_isShutdown);
 
     RefPtr<StorageArea> storageArea;
     if (storageArea = m_storageAreaMap.get(origin))
         return storageArea.release();
 
-    storageArea = StorageArea::create(m_storageType, origin, m_syncManager);
+    storageArea = StorageAreaImpl::create(m_storageType, origin, m_syncManager);
     m_storageAreaMap.set(origin, storageArea);
     return storageArea.release();
 }
 
 void StorageNamespaceImpl::close()
 {
     ASSERT(isMainThread());
     ASSERT(!m_isShutdown);
 
     StorageAreaMap::iterator end = m_storageAreaMap.end();
     for (StorageAreaMap::iterator it = m_storageAreaMap.begin(); it != end; ++it)
         it->second->close();
 
 #ifndef NDEBUG
     m_isShutdown = true;
 #endif
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(DOM_STORAGE)