Persist sessionStorage on disk.

webkit/dom_storage/dom_storage_area.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_area.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 45 matching lines @@
     int64 namespace_id, const GURL& origin,
     const FilePath& directory, DomStorageTaskRunner* task_runner)
     : namespace_id_(namespace_id), origin_(origin),
       directory_(directory),
       task_runner_(task_runner),
       map_(new DomStorageMap(kPerAreaQuota)),
       is_initial_import_done_(true),
       is_shutdown_(false) {
   if (namespace_id == kLocalStorageNamespaceId && !directory.empty()) {
     FilePath path = directory.Append(DatabaseFileNameFromOrigin(origin_));
-    backing_.reset(new DomStorageDatabase(path));
+    backing_.reset(new LocalStorageDatabase(path));
     is_initial_import_done_ = false;
   }
 }
 
 DomStorageArea::~DomStorageArea() {
 }
 
 unsigned DomStorageArea::Length() {
   if (is_shutdown_)
     return 0;
@@ skipping 84 matching lines @@
   DCHECK(!is_shutdown_);
   if (HasUncommittedChanges()) {
     // TODO(michaeln): This logically deletes the data immediately,
     // and in a matter of a second, deletes the rows from the backing
     // database file, but the file itself will linger until shutdown
     // or purge time. Ideally, this should delete the file more
     // quickly.
     Clear();
     return;
   }
+  // FIXME(marja): session storage here...
   map_ = new DomStorageMap(kPerAreaQuota);
   if (backing_.get()) {
     is_initial_import_done_ = false;
-    backing_.reset(new DomStorageDatabase(backing_->file_path()));
+    backing_.reset(new LocalStorageDatabase(backing_->file_path()));
     file_util::Delete(backing_->file_path(), false);
     file_util::Delete(
-        DomStorageDatabase::GetJournalFilePath(backing_->file_path()), false);
+        LocalStorageDatabase::GetJournalFilePath(backing_->file_path()), false);
   }
 }
 
 void DomStorageArea::PurgeMemory() {
   DCHECK(!is_shutdown_);
   if (!is_initial_import_done_ ||  // We're not using any memory.
       !backing_.get() ||  // We can't purge anything.
       HasUncommittedChanges())  // We leave things alone with changes pending.
     return;
 
   // Drop the in memory cache, we'll reload when needed.
   is_initial_import_done_ = false;
   map_ = new DomStorageMap(kPerAreaQuota);
 
   // Recreate the database object, this frees up the open sqlite connection
   // and its page cache.
-  backing_.reset(new DomStorageDatabase(backing_->file_path()));
+  backing_.reset(new LocalStorageDatabase(backing_->file_path()));
 }
 
 void DomStorageArea::Shutdown() {
   DCHECK(!is_shutdown_);
   is_shutdown_ = true;
   map_ = NULL;
   if (!backing_.get())
     return;
 
   bool success = task_runner_->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::COMMIT_SEQUENCE,
       base::Bind(&DomStorageArea::ShutdownInCommitSequence, this));
   DCHECK(success);
 }
 
 void DomStorageArea::InitialImportIfNeeded() {
   if (is_initial_import_done_)
     return;
 
   DCHECK_EQ(kLocalStorageNamespaceId, namespace_id_);
   DCHECK(backing_.get());
 
   ValuesMap initial_values;
-  backing_->ReadAllValues(&initial_values);
+  backing_->ReadAllValues(namespace_id_, origin_, &initial_values);
   map_->SwapValues(&initial_values);
   is_initial_import_done_ = true;
 }
 
 DomStorageArea::CommitBatch* DomStorageArea::CreateCommitBatchIfNeeded() {
   DCHECK(!is_shutdown_);
   if (!commit_batch_.get()) {
     commit_batch_.reset(new CommitBatch());
 
     // Start a timer to commit any changes that accrue in the batch,
@@ skipping 25 matching lines @@
       FROM_HERE,
       DomStorageTaskRunner::COMMIT_SEQUENCE,
       base::Bind(&DomStorageArea::CommitChanges, this));
   DCHECK(success);
 }
 
 void DomStorageArea::CommitChanges() {
   // This method executes on the commit sequence.
   DCHECK(in_flight_commit_batch_.get());
   bool success = backing_->CommitChanges(
+      namespace_id_, origin_,
       in_flight_commit_batch_->clear_all_first,
       in_flight_commit_batch_->changed_values);
   DCHECK(success);  // TODO(michaeln): what if it fails?
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageArea::OnCommitComplete, this));
 }
 
 void DomStorageArea::OnCommitComplete() {
   // We're back on the primary sequence in this method.
   if (is_shutdown_)
     return;
   in_flight_commit_batch_.reset();
   if (commit_batch_.get()) {
     // More changes have accrued, restart the timer.
     task_runner_->PostDelayedTask(
         FROM_HERE,
         base::Bind(&DomStorageArea::OnCommitTimer, this),
         base::TimeDelta::FromSeconds(kCommitTimerSeconds));
   }
 }
 
 void DomStorageArea::ShutdownInCommitSequence() {
   // This method executes on the commit sequence.
   DCHECK(backing_.get());
   if (commit_batch_.get()) {
     // Commit any changes that accrued prior to the timer firing.
     bool success = backing_->CommitChanges(
+        namespace_id_, origin_,
         commit_batch_->clear_all_first,
         commit_batch_->changed_values);
     DCHECK(success);
   }
   commit_batch_.reset();
   in_flight_commit_batch_.reset();
   backing_.reset();
 }
 
 }  // namespace dom_storage