Persist sessionStorage on disk.

webkit/dom_storage/dom_storage_area.h

 // 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.
 
 #ifndef WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #define WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #pragma once
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
+#include "base/synchronization/lock.h"

[michaeln, 2012/07/10 19:04:13]

is this still needed?

[marja, 2012/07/11 12:41:31]

Done.

 #include "googleurl/src/gurl.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 
 namespace dom_storage {
 
 class DomStorageDatabaseAdapter;
 class DomStorageMap;
 class DomStorageTaskRunner;
+class SessionStorageDatabase;
 
 // Container for a per-origin Map of key/value pairs potentially
 // backed by storage on disk and lazily commits changes to disk.
 // See class comments for DomStorageContext for a larger overview.
 class DomStorageArea
     : public base::RefCountedThreadSafe<DomStorageArea> {
 
  public:
   static const FilePath::CharType kDatabaseFileExtension[];
   static FilePath DatabaseFileNameFromOrigin(const GURL& origin);
   static GURL OriginFromDatabaseFileName(const FilePath& file_name);
 
   // Local storage. Backed on disk if directory is nonempty.
   DomStorageArea(const GURL& origin,
                  const FilePath& directory,
                  DomStorageTaskRunner* task_runner);
 
-  // Session storage.
+  // Session storage. Backed on disk if |session_storage_backing| is not NULL.
   DomStorageArea(int64 namespace_id,
                  const std::string& persistent_namespace_id,
                  const GURL& origin,
+                 SessionStorageDatabase* session_storage_backing,
                  DomStorageTaskRunner* task_runner);
 
   const GURL& origin() const { return origin_; }
   int64 namespace_id() const { return namespace_id_; }
 
   // Writes a copy of the current set of values in the area to the |map|.
   void ExtractValues(ValuesMap* map);
 
   unsigned Length();
   NullableString16 Key(unsigned index);
@@ skipping 50 matching lines @@
   void InitialImportIfNeeded();
 
   // Post tasks to defer writing a batch of changed values to
   // disk on the commit sequence, and to call back on the primary
   // task sequence when complete.
   CommitBatch* CreateCommitBatchIfNeeded();
   void OnCommitTimer();
   void CommitChanges(const CommitBatch* commit_batch);
   void OnCommitComplete();
 
+  void DeleteOriginInCommitSequence();

[michaeln, 2012/07/10 19:04:13]

and this?

[marja, 2012/07/11 12:41:31]

Done.

+
   void ShutdownInCommitSequence();
 
   int64 namespace_id_;
   std::string persistent_namespace_id_;
   GURL origin_;
   FilePath directory_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageMap> map_;
   scoped_ptr<DomStorageDatabaseAdapter> backing_;
+  scoped_refptr<SessionStorageDatabase> session_storage_backing_;
   bool is_initial_import_done_;
   bool is_shutdown_;
   scoped_ptr<CommitBatch> commit_batch_;
   int commit_batches_in_flight_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_