Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: content/browser/in_process_webkit/dom_storage_namespace.h

Issue 7480041: Adding session-only localStorage. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Adding tests. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_ 5 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_
6 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_ 6 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/hash_tables.h" 9 #include "base/hash_tables.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 13 matching lines...) Expand all
24 // Only to be used on the WebKit thread. 24 // Only to be used on the WebKit thread.
25 class DOMStorageNamespace { 25 class DOMStorageNamespace {
26 public: 26 public:
27 static DOMStorageNamespace* CreateLocalStorageNamespace( 27 static DOMStorageNamespace* CreateLocalStorageNamespace(
28 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path); 28 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path);
29 static DOMStorageNamespace* CreateSessionStorageNamespace( 29 static DOMStorageNamespace* CreateSessionStorageNamespace(
30 DOMStorageContext* dom_storage_context, int64 namespace_id); 30 DOMStorageContext* dom_storage_context, int64 namespace_id);
31 31
32 ~DOMStorageNamespace(); 32 ~DOMStorageNamespace();
33 33
34 DOMStorageArea* GetStorageArea(const string16& origin); 34 DOMStorageArea* GetStorageArea(const string16& origin,
35 bool allow_permanent_storage);
35 DOMStorageNamespace* Copy(int64 clone_namespace_id); 36 DOMStorageNamespace* Copy(int64 clone_namespace_id);
36 37
37 void PurgeMemory(); 38 void PurgeMemory();
38 39
39 const DOMStorageContext* dom_storage_context() const { 40 const DOMStorageContext* dom_storage_context() const {
40 return dom_storage_context_; 41 return dom_storage_context_;
41 } 42 }
42 int64 id() const { return id_; } 43 int64 id() const { return id_; }
43 const WebKit::WebString& data_dir_path() const { return data_dir_path_; } 44 const WebKit::WebString& data_dir_path() const { return data_dir_path_; }
44 DOMStorageType dom_storage_type() const { return dom_storage_type_; } 45 DOMStorageType dom_storage_type() const { return dom_storage_type_; }
45 46
46 // Creates a WebStorageArea for the given origin. This should only be called 47 // Creates a WebStorageArea for the given origin. This should only be called
47 // by an owned DOMStorageArea. 48 // by an owned DOMStorageArea.
48 WebKit::WebStorageArea* CreateWebStorageArea(const string16& origin); 49 WebKit::WebStorageArea* CreateWebStorageArea(const string16& origin);
49 50
50 private: 51 private:
51 // Called by the static factory methods above. 52 // Called by the static factory methods above.
52 DOMStorageNamespace(DOMStorageContext* dom_storage_context, 53 DOMStorageNamespace(DOMStorageContext* dom_storage_context,
53 int64 id, 54 int64 id,
54 const WebKit::WebString& data_dir_path, 55 const WebKit::WebString& data_dir_path,
55 DOMStorageType storage_type); 56 DOMStorageType storage_type);
56 57
57 // Creates the underlying WebStorageNamespace on demand. 58 // Creates the underlying WebStorageNamespace on demand.
58 void CreateWebStorageNamespaceIfNecessary(); 59 void CreateWebStorageNamespaceIfNecessary();
59 60
61 // Helpers for creating DOMStorageAreas.
62 DOMStorageArea* GetExistingStorageArea(const string16& origin);
63 DOMStorageArea* CreateStorageArea(const string16& origin);
64
60 // All the storage areas we own. 65 // All the storage areas we own.
61 typedef base::hash_map<string16, DOMStorageArea*> OriginToStorageAreaMap; 66 typedef base::hash_map<string16, DOMStorageArea*> OriginToStorageAreaMap;
62 OriginToStorageAreaMap origin_to_storage_area_; 67 OriginToStorageAreaMap origin_to_storage_area_;
63 68
64 // The DOMStorageContext that owns us. 69 // The DOMStorageContext that owns us.
65 DOMStorageContext* dom_storage_context_; 70 DOMStorageContext* dom_storage_context_;
66 71
67 // The WebKit storage namespace we manage. 72 // The WebKit storage namespace we manage.
68 scoped_ptr<WebKit::WebStorageNamespace> storage_namespace_; 73 scoped_ptr<WebKit::WebStorageNamespace> storage_namespace_;
69 74
70 // Our id. Unique to our parent WebKitContext class. 75 // Our id. Unique to our parent WebKitContext class.
71 int64 id_; 76 int64 id_;
72 77
73 // The path used to create us, so we can recreate our WebStorageNamespace on 78 // The path used to create us, so we can recreate our WebStorageNamespace on
74 // demand. 79 // demand.
75 WebKit::WebString data_dir_path_; 80 WebKit::WebString data_dir_path_;
76 81
77 // SessionStorage vs. LocalStorage. 82 // SessionStorage vs. LocalStorage.
78 const DOMStorageType dom_storage_type_; 83 const DOMStorageType dom_storage_type_;
79 84
85 // A LocalStorage namespace holds a pointer to a session-only LocalStorage
86 // namespace. NULL if this DOMStorageNamespace is a SessionStorage, or a
87 // session-only LocalStorage, or a LocalStorage associated with an off the
88 // record profile.
89 scoped_ptr<DOMStorageNamespace> session_only_local_storage_;
90
80 DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageNamespace); 91 DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageNamespace);
81 }; 92 };
82 93
83 #endif // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_ 94 #endif // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698