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

Side by Side Diff: webkit/dom_storage/dom_storage_namespace.cc

Issue 9963107: Persist sessionStorage on disk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review. Created 8 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "webkit/dom_storage/dom_storage_namespace.h" 5 #include "webkit/dom_storage/dom_storage_namespace.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h"
9 #include "base/location.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "webkit/dom_storage/dom_storage_area.h" 11 #include "webkit/dom_storage/dom_storage_area.h"
10 #include "webkit/dom_storage/dom_storage_task_runner.h" 12 #include "webkit/dom_storage/dom_storage_task_runner.h"
11 #include "webkit/dom_storage/dom_storage_types.h" 13 #include "webkit/dom_storage/dom_storage_types.h"
14 #include "webkit/dom_storage/session_storage_database.h"
12 15
13 namespace dom_storage { 16 namespace dom_storage {
14 17
15 DomStorageNamespace::DomStorageNamespace( 18 DomStorageNamespace::DomStorageNamespace(
16 const FilePath& directory, 19 const FilePath& directory,
17 DomStorageTaskRunner* task_runner) 20 DomStorageTaskRunner* task_runner)
18 : namespace_id_(kLocalStorageNamespaceId), 21 : namespace_id_(kLocalStorageNamespaceId),
19 directory_(directory), 22 directory_(directory),
20 task_runner_(task_runner) { 23 task_runner_(task_runner) {
21 } 24 }
22 25
23 DomStorageNamespace::DomStorageNamespace( 26 DomStorageNamespace::DomStorageNamespace(
24 int64 namespace_id, 27 int64 namespace_id,
28 const std::string& persistent_namespace_id,
29 SessionStorageDatabase* session_storage_database,
25 DomStorageTaskRunner* task_runner) 30 DomStorageTaskRunner* task_runner)
26 : namespace_id_(namespace_id), 31 : namespace_id_(namespace_id),
27 task_runner_(task_runner) { 32 persistent_namespace_id_(persistent_namespace_id),
33 task_runner_(task_runner),
34 session_storage_database_(session_storage_database) {
28 DCHECK_NE(kLocalStorageNamespaceId, namespace_id); 35 DCHECK_NE(kLocalStorageNamespaceId, namespace_id);
29 } 36 }
30 37
31 DomStorageNamespace::~DomStorageNamespace() { 38 DomStorageNamespace::~DomStorageNamespace() {
32 } 39 }
33 40
34 DomStorageArea* DomStorageNamespace::OpenStorageArea(const GURL& origin) { 41 DomStorageArea* DomStorageNamespace::OpenStorageArea(const GURL& origin) {
35 if (AreaHolder* holder = GetAreaHolder(origin)) { 42 if (AreaHolder* holder = GetAreaHolder(origin)) {
36 ++(holder->open_count_); 43 ++(holder->open_count_);
37 return holder->area_; 44 return holder->area_;
38 } 45 }
39 DomStorageArea* area = new DomStorageArea(namespace_id_, origin, 46 DomStorageArea* area;
40 directory_, task_runner_); 47 if (namespace_id_ == kLocalStorageNamespaceId) {
48 area = new DomStorageArea(namespace_id_, origin, directory_, task_runner_);
49 } else {
50 area = new DomStorageArea(namespace_id_, persistent_namespace_id_, origin,
51 session_storage_database_, task_runner_);
52 }
41 areas_[origin] = AreaHolder(area, 1); 53 areas_[origin] = AreaHolder(area, 1);
42 return area; 54 return area;
43 } 55 }
44 56
45 void DomStorageNamespace::CloseStorageArea(DomStorageArea* area) { 57 void DomStorageNamespace::CloseStorageArea(DomStorageArea* area) {
46 AreaHolder* holder = GetAreaHolder(area->origin()); 58 AreaHolder* holder = GetAreaHolder(area->origin());
47 DCHECK(holder); 59 DCHECK(holder);
48 DCHECK_EQ(holder->area_.get(), area); 60 DCHECK_EQ(holder->area_.get(), area);
49 --(holder->open_count_); 61 --(holder->open_count_);
50 // TODO(michaeln): Clean up areas that aren't needed in memory anymore. 62 // TODO(michaeln): Clean up areas that aren't needed in memory anymore.
51 // The in-process-webkit based impl didn't do this either, but would be nice. 63 // The in-process-webkit based impl didn't do this either, but would be nice.
52 } 64 }
53 65
54 DomStorageNamespace* DomStorageNamespace::Clone(int64 clone_namespace_id) { 66 DomStorageNamespace* DomStorageNamespace::Clone(
67 int64 clone_namespace_id,
68 const std::string& clone_persistent_namespace_id) {
55 DCHECK_NE(kLocalStorageNamespaceId, namespace_id_); 69 DCHECK_NE(kLocalStorageNamespaceId, namespace_id_);
56 DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id); 70 DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id);
57 DomStorageNamespace* clone = 71 DomStorageNamespace* clone = new DomStorageNamespace(
58 new DomStorageNamespace(clone_namespace_id, task_runner_); 72 clone_namespace_id, clone_persistent_namespace_id,
73 session_storage_database_, task_runner_);
59 AreaMap::const_iterator it = areas_.begin(); 74 AreaMap::const_iterator it = areas_.begin();
75 // Clone the in-memory structures.
60 for (; it != areas_.end(); ++it) { 76 for (; it != areas_.end(); ++it) {
61 DomStorageArea* area = it->second.area_->ShallowCopy(clone_namespace_id); 77 DomStorageArea* area = it->second.area_->ShallowCopy(
78 clone_namespace_id, clone_persistent_namespace_id);
62 clone->areas_[it->first] = AreaHolder(area, 0); 79 clone->areas_[it->first] = AreaHolder(area, 0);
63 } 80 }
81 // And clone the on-disk structures, too.
82 if (session_storage_database_.get()) {
83 bool success = task_runner_->PostShutdownBlockingTask(
84 FROM_HERE,
85 DomStorageTaskRunner::COMMIT_SEQUENCE,
86 base::Bind(base::IgnoreResult(&SessionStorageDatabase::CloneNamespace),
87 session_storage_database_.get(), persistent_namespace_id_,
88 clone_persistent_namespace_id));
89 DCHECK(success);
90 }
64 return clone; 91 return clone;
65 } 92 }
66 93
67 void DomStorageNamespace::DeleteOrigin(const GURL& origin) { 94 void DomStorageNamespace::DeleteOrigin(const GURL& origin) {
95 DCHECK(!session_storage_database_.get());
68 AreaHolder* holder = GetAreaHolder(origin); 96 AreaHolder* holder = GetAreaHolder(origin);
69 if (holder) { 97 if (holder) {
70 holder->area_->DeleteOrigin(); 98 holder->area_->DeleteOrigin();
71 return; 99 return;
72 } 100 }
73 if (!directory_.empty()) { 101 if (!directory_.empty()) {
74 scoped_refptr<DomStorageArea> area = 102 scoped_refptr<DomStorageArea> area =
75 new DomStorageArea(namespace_id_, origin, directory_, task_runner_); 103 new DomStorageArea(namespace_id_, origin, directory_, task_runner_);
76 area->DeleteOrigin(); 104 area->DeleteOrigin();
77 } 105 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 153
126 DomStorageNamespace::AreaHolder::AreaHolder( 154 DomStorageNamespace::AreaHolder::AreaHolder(
127 DomStorageArea* area, int count) 155 DomStorageArea* area, int count)
128 : area_(area), open_count_(count) { 156 : area_(area), open_count_(count) {
129 } 157 }
130 158
131 DomStorageNamespace::AreaHolder::~AreaHolder() { 159 DomStorageNamespace::AreaHolder::~AreaHolder() {
132 } 160 }
133 161
134 } // namespace dom_storage 162 } // namespace dom_storage
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698