Framing for a DOMStorage backend that does not depend on in-process-webkit.

webkit/dom_storage/dom_storage_area.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
-#define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
+#ifndef WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
+#define WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #pragma once
 
-#include "base/hash_tables.h"
+#include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
-#include "content/common/dom_storage_common.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h"
+#include "webkit/dom_storage/dom_storage_task_runner.h"
 
-class DOMStorageNamespace;
-// Only use on the WebKit thread.  DOMStorageNamespace manages our registration
-// with DOMStorageContext.
-class DOMStorageArea {
+class FilePath;
+class GURL;
+
+namespace dom_storage {
+
+// Not thread-safe, should only be called on the
+// background thread.
+class DomStorageArea
+    : public base::RefCounted<DomStorageArea> {
+
  public:
-  DOMStorageArea(const string16& origin,
-                 int64 id,
-                 DOMStorageNamespace* owner);
-  ~DOMStorageArea();
+  DomStorageArea(const GURL& origin,
+                 int64 namespace_id,
+                 const FilePath& backing_file,
+                 DomStorageTaskRunner* task_runner);
 
-  unsigned Length();
-  NullableString16 Key(unsigned index);
+  const GURL& origin() const { return origin_; }
+  const int64 namespace_id() { return namespace_id_; }
+
+  int Length();

[benm (inactive), 2012/01/31 18:03:38]

I used unsigned here, wdyt? (also for Key below)

[michaeln, 2012/01/31 21:17:45]

k... lets switch to unsigned so we retain the datatypes used in the existing
impl

+  NullableString16 Key(int index);
   NullableString16 GetItem(const string16& key);
-  NullableString16 SetItem(
+  bool SetItem(
       const string16& key, const string16& value,
-      WebKit::WebStorageArea::Result* result);
-  NullableString16 RemoveItem(const string16& key);
+      NullableString16* old_value);
+  bool RemoveItem(
+      const string16& key,
+      string16* old_value);
   bool Clear();
+
   void PurgeMemory();
 
-  int64 id() const { return id_; }
-
-  DOMStorageNamespace* owner() const { return owner_; }
+  void SyncChanges();

[benm (inactive), 2012/01/31 18:03:38]

SyncChangesToBacking?

[michaeln, 2012/01/31 21:17:45]

'sync' can imply reading and writing, but really this is only about committing
changes in memory to the db

wdyt about using 'CommitChanges' instead to avoid the less clear 'sync'  term?

 
  private:
-  // Creates the underlying WebStorageArea on demand.
-  void CreateWebStorageAreaIfNecessary();
+  friend class base::RefCounted<DomStorageArea>;
 
-  // The origin this storage area represents.
-  string16 origin_;
-  GURL origin_url_;
+  ~DomStorageArea();
 
-  // The storage area we wrap.
-  scoped_ptr<WebKit::WebStorageArea> storage_area_;
-
-  // Our storage area id.  Unique to our parent WebKitContext.
-  int64 id_;
-
-  // The DOMStorageNamespace that owns us.
-  DOMStorageNamespace* owner_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageArea);
+  int64 namespace_id_;
+  GURL origin_;
+  FilePath backing_fail_path_;

[benm (inactive), 2012/01/31 18:03:38]

file :)

+  scoped_refptr<DomStorageTaskRunner> task_runner_;
 };
 
-#if defined(COMPILER_GCC)
-namespace __gnu_cxx {
+}  // namespace dom_storage
 
-template<>
-struct hash<DOMStorageArea*> {
-  std::size_t operator()(DOMStorageArea* const& p) const {
-    return reinterpret_cast<std::size_t>(p);
-  }
-};
-
-}  // namespace __gnu_cxx
-#endif
-
-#endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
+#endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_