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

webkit/dom_storage/dom_storage_map.h

Index: webkit/dom_storage/dom_storage_map.h
===================================================================
--- webkit/dom_storage/dom_storage_map.h	(revision 0)
+++ webkit/dom_storage/dom_storage_map.h	(revision 0)
@@ -0,0 +1,43 @@
+// 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_MAP_H_
+#define WEBKIT_DOM_STORAGE_DOM_STORAGE_MAP_H_
+#pragma once
+
+#include <map>
+
+#include "base/memory/ref_counted.h"
+#include "base/nullable_string16.h"
+#include "base/string16.h"
+
+class FilePath;
+class GURL;
+
+namespace dom_storage {
+
+class DomStorageMap

[benm (inactive), 2012/02/02 16:23:19]

This looks very similar to the DomStorageArea CL I was working on. As I already
have tests set up for that and have addressed some of the TODOs I see in the cc,
I could merge this with it and rename my class to DomStorageMap? I guess
DomStorageArea should still be responsible for syncing things to a backing
database, so I'd remove those bits from my CL.

[michaeln, 2012/02/03 00:33:42]

Ack about the 'area' being responsible for reading/writing and the 'map' just
being a collection. We need to start landing stuff so we can work in parallel on
the same source files and all that

+    : public base::RefCountedThreadSafe<DomStorageMap> {
+ public:
+  unsigned Length();
+  NullableString16 Key(unsigned index);
+  NullableString16 GetItem(const string16& key);
+  bool SetItem(const string16& key, const string16& value,
+               NullableString16* old_value);
+  bool RemoveItem(const string16& key, string16* old_value);
+
+  DomStorageMap* DeepCopy();
+

[benm (inactive), 2012/02/02 16:23:19]

The way that the DomStorageDatabase is set up right now I guess we also need an
accessor to get at the underlying map.

[michaeln, 2012/02/03 00:33:42]

Done, added a SwapValues(values_map) method.

+ private:
+  friend class base::RefCountedThreadSafe<DomStorageMap>;
+  typedef std::map<string16, NullableString16> ValuesMap;
+
+  ~DomStorageMap() {}
+
+  ValuesMap values_;
+};
+
+}  // namespace dom_storage
+
+#endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
Property changes on: webkit\dom_storage\dom_storage_map.h
___________________________________________________________________
Added: svn:eol-style
   + LF