DomStorage commit task sequencing.

webkit/dom_storage/dom_storage_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/dom_storage/dom_storage_context.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/time.h"
@@ skipping 12 matching lines @@
 
 DomStorageContext::UsageInfo::UsageInfo() {}
 DomStorageContext::UsageInfo::~UsageInfo() {}
 
 DomStorageContext::DomStorageContext(
     const FilePath& directory,
     quota::SpecialStoragePolicy* special_storage_policy,
     DomStorageTaskRunner* task_runner)
     : directory_(directory),
       task_runner_(task_runner),
+      is_shutdown_(false),
       clear_local_state_(false),
       save_session_state_(false),
       special_storage_policy_(special_storage_policy) {
   // AtomicSequenceNum starts at 0 but we want to start session
   // namespace ids at one since zero is reserved for the
   // kLocalStorageNamespaceId.
   session_id_sequence_.GetNext();
 }
 
 DomStorageContext::~DomStorageContext() {
 }
 
 DomStorageNamespace* DomStorageContext::GetStorageNamespace(
     int64 namespace_id) {
+  if (is_shutdown_)
+    return NULL;
   StorageNamespaceMap::iterator found = namespaces_.find(namespace_id);
   if (found == namespaces_.end()) {
     if (namespace_id == kLocalStorageNamespaceId) {
       DomStorageNamespace* local =
           new DomStorageNamespace(directory_, task_runner_);
       namespaces_[kLocalStorageNamespaceId] = local;
       return local;
     }
     return NULL;
   }
@@ skipping 25 matching lines @@
 
 void DomStorageContext::DeleteOrigin(const GURL& origin) {
   // TODO(michaeln): write me
 }
 
 void DomStorageContext::DeleteDataModifiedSince(const base::Time& cutoff) {
   // TODO(michaeln): write me
 }
 
 void DomStorageContext::PurgeMemory() {
-  // TODO(michaeln): write me
+  // We can only purge memory from the local storage namespace
+  // which is backed by disk.
+  StorageNamespaceMap::iterator found =
+      namespaces_.find(kLocalStorageNamespaceId);
+  if (found != namespaces_.end())
+    found->second->PurgeMemory();
 }
 
 void DomStorageContext::Shutdown() {
-  // TODO(michaeln): write me
+  is_shutdown_ = true;
+  StorageNamespaceMap::const_iterator it = namespaces_.begin();
+  for (; it != namespaces_.end(); ++it)
+    it->second->Shutdown();
 }
 
 void DomStorageContext::AddEventObserver(EventObserver* observer) {
   event_observers_.AddObserver(observer);
 }
 
 void DomStorageContext::RemoveEventObserver(EventObserver* observer) {
   event_observers_.RemoveObserver(observer);
 }
 
@@ skipping 21 matching lines @@
 void DomStorageContext::NotifyAreaCleared(
     const DomStorageArea* area,
     const GURL& page_url) {
   FOR_EACH_OBSERVER(
       EventObserver, event_observers_,
       OnDomStorageAreaCleared(area, page_url));
 }
 
 void DomStorageContext::CreateSessionNamespace(
     int64 namespace_id) {
+  if (is_shutdown_)
+    return;
   DCHECK(namespace_id != kLocalStorageNamespaceId);
   DCHECK(namespaces_.find(namespace_id) == namespaces_.end());
   namespaces_[namespace_id] = new DomStorageNamespace(
       namespace_id, task_runner_);
 }
 
 void DomStorageContext::DeleteSessionNamespace(
     int64 namespace_id) {
   DCHECK_NE(kLocalStorageNamespaceId, namespace_id);
   namespaces_.erase(namespace_id);
 }
 
 void DomStorageContext::CloneSessionNamespace(
     int64 existing_id, int64 new_id) {
+  if (is_shutdown_)
+    return;
   DCHECK_NE(kLocalStorageNamespaceId, existing_id);
   DCHECK_NE(kLocalStorageNamespaceId, new_id);
   StorageNamespaceMap::iterator found = namespaces_.find(existing_id);
   if (found != namespaces_.end())
     namespaces_[new_id] = found->second->Clone(new_id);
   else
     CreateSessionNamespace(new_id);
 }
 
 }  // namespace dom_storage