Hook up DomStorageArea with a DomStorageDatabase.

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/memory/ref_counted.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/dom_storage/dom_storage_database.h"

[michaeln, 2012/02/14 06:39:26]

instead of directly including, i think this could just be a forward decl in the
.h file

[benm (inactive), 2012/02/14 11:12:07]

I think it needs to be #included as it's used in a scoped_ptr rather than a
scoped_refptr.

 #include "webkit/dom_storage/dom_storage_task_runner.h"
 
 class FilePath;
 class GURL;
 
 namespace dom_storage {
 
 class DomStorageMap;
 
 // Container for a per-origin Map of key/value pairs potentially
@@ skipping 16 matching lines @@
   NullableString16 GetItem(const string16& key);
   bool SetItem(const string16& key, const string16& value,
                NullableString16* old_value);
   bool RemoveItem(const string16& key, string16* old_value);
   bool Clear();
 
   DomStorageArea* ShallowCopy(int64 destination_namespace_id);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, DomStorageAreaBasics);
+  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, BackingDatabaseOpened);
+  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, TestDatabaseFilePath);
   friend class base::RefCountedThreadSafe<DomStorageArea>;
 
+  void InitialImportIfNeeded();
+  void SyncToBacking();

[michaeln, 2012/02/14 06:39:26]

should we stick with the CommitChanges terminology at to match whats used in
DomStorageDatabase?

[benm (inactive), 2012/02/14 11:12:07]

Done.

+
+  static FilePath DatabaseFileNameFromOrigin(const GURL& origin);
+
   ~DomStorageArea();
 
   int64 namespace_id_;
   GURL origin_;
   FilePath directory_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageMap> map_;
-  // TODO(benm): integrate with DomStorageDatabase to read from
-  // and lazily write to disk.
+  scoped_ptr<DomStorageDatabase> backing_;
+  bool initial_import_done_;
+  ValuesMap items_to_sync_;

[michaeln, 2012/02/14 06:39:26]

if switching terminology, changed_values_?

[benm (inactive), 2012/02/14 11:12:07]

Done.

+  bool clear_all_next_sync_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_