OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/browser/dom_storage/dom_storage_context_wrapper.h" | 5 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
15 #include "base/thread_task_runner_handle.h" | 15 #include "base/thread_task_runner_handle.h" |
16 #include "components/filesystem/public/interfaces/file_system.mojom.h" | |
16 #include "content/browser/dom_storage/dom_storage_area.h" | 17 #include "content/browser/dom_storage/dom_storage_area.h" |
17 #include "content/browser/dom_storage/dom_storage_context_impl.h" | 18 #include "content/browser/dom_storage/dom_storage_context_impl.h" |
18 #include "content/browser/dom_storage/dom_storage_task_runner.h" | 19 #include "content/browser/dom_storage/dom_storage_task_runner.h" |
19 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 20 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
20 #include "content/browser/level_db_wrapper_impl.h" | 21 #include "content/browser/level_db_wrapper_impl.h" |
21 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
22 #include "content/public/browser/local_storage_usage_info.h" | 23 #include "content/public/browser/local_storage_usage_info.h" |
24 #include "content/public/browser/mojo_app_connection.h" | |
23 #include "content/public/browser/session_storage_usage_info.h" | 25 #include "content/public/browser/session_storage_usage_info.h" |
26 #include "mojo/util/capture_util.h" | |
24 | 27 |
25 namespace content { | 28 namespace content { |
26 namespace { | 29 namespace { |
27 | 30 |
28 const char kLocalStorageDirectory[] = "Local Storage"; | 31 const char kLocalStorageDirectory[] = "Local Storage"; |
29 const char kSessionStorageDirectory[] = "Session Storage"; | 32 const char kSessionStorageDirectory[] = "Session Storage"; |
30 | 33 |
31 void InvokeLocalStorageUsageCallbackHelper( | 34 void InvokeLocalStorageUsageCallbackHelper( |
32 const DOMStorageContext::GetLocalStorageUsageCallback& callback, | 35 const DOMStorageContext::GetLocalStorageUsageCallback& callback, |
33 const std::vector<LocalStorageUsageInfo>* infos) { | 36 const std::vector<LocalStorageUsageInfo>* infos) { |
(...skipping 27 matching lines...) Expand all Loading... | |
61 context->GetSessionStorageUsage(infos); | 64 context->GetSessionStorageUsage(infos); |
62 reply_task_runner->PostTask( | 65 reply_task_runner->PostTask( |
63 FROM_HERE, base::Bind(&InvokeSessionStorageUsageCallbackHelper, callback, | 66 FROM_HERE, base::Bind(&InvokeSessionStorageUsageCallbackHelper, callback, |
64 base::Owned(infos))); | 67 base::Owned(infos))); |
65 } | 68 } |
66 | 69 |
67 } // namespace | 70 } // namespace |
68 | 71 |
69 DOMStorageContextWrapper::DOMStorageContextWrapper( | 72 DOMStorageContextWrapper::DOMStorageContextWrapper( |
70 const base::FilePath& data_path, | 73 const base::FilePath& data_path, |
71 storage::SpecialStoragePolicy* special_storage_policy) { | 74 storage::SpecialStoragePolicy* special_storage_policy) |
75 : connection_state_(NO_CONNECTION), | |
76 weak_ptr_factory_(this) { | |
72 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); | 77 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); |
73 context_ = new DOMStorageContextImpl( | 78 context_ = new DOMStorageContextImpl( |
74 data_path.empty() ? data_path | 79 data_path.empty() ? data_path |
75 : data_path.AppendASCII(kLocalStorageDirectory), | 80 : data_path.AppendASCII(kLocalStorageDirectory), |
76 data_path.empty() ? data_path | 81 data_path.empty() ? data_path |
77 : data_path.AppendASCII(kSessionStorageDirectory), | 82 : data_path.AppendASCII(kSessionStorageDirectory), |
78 special_storage_policy, | 83 special_storage_policy, |
79 new DOMStorageWorkerPoolTaskRunner( | 84 new DOMStorageWorkerPoolTaskRunner( |
80 worker_pool, | 85 worker_pool, |
81 worker_pool->GetNamedSequenceToken("dom_storage_primary"), | 86 worker_pool->GetNamedSequenceToken("dom_storage_primary"), |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
164 DCHECK(context_.get()); | 169 DCHECK(context_.get()); |
165 context_->task_runner()->PostShutdownBlockingTask( | 170 context_->task_runner()->PostShutdownBlockingTask( |
166 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, | 171 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
167 base::Bind(&DOMStorageContextImpl::Flush, context_)); | 172 base::Bind(&DOMStorageContextImpl::Flush, context_)); |
168 } | 173 } |
169 | 174 |
170 void DOMStorageContextWrapper::OpenLocalStorage( | 175 void DOMStorageContextWrapper::OpenLocalStorage( |
171 const mojo::String& origin, | 176 const mojo::String& origin, |
172 LevelDBObserverPtr observer, | 177 LevelDBObserverPtr observer, |
173 mojo::InterfaceRequest<LevelDBWrapper> request) { | 178 mojo::InterfaceRequest<LevelDBWrapper> request) { |
179 // If we don't have a filesystem_connection_, we'll need to establish one. | |
180 if (connection_state_ == NO_CONNECTION) { | |
181 file_system_connection_ = content::MojoAppConnection::Create( | |
182 GURL("mojo:filesystem"), GURL(content::kBrowserMojoAppUrl)); | |
michaeln
2016/02/26 21:59:25
is there a way to provide the root_directory path
Elliot Glaysher
2016/03/02 23:06:19
This was the big reason I went off and did the Pro
| |
183 file_system_connection_->GetInterface(&file_system_); | |
184 | |
185 file_system_->OpenTempDirectory( | |
186 GetProxy(&directory_), | |
187 base::Bind(&DOMStorageContextWrapper::OnDirectoryOpened, | |
188 weak_ptr_factory_.GetWeakPtr())); | |
189 connection_state_ = CONNECITON_IN_PROGRESS; | |
190 } | |
191 | |
192 if (connection_state_ == CONNECITON_IN_PROGRESS) { | |
193 // Queue this OpenLocalStorage call for when we have a level db pointer. | |
194 on_database_opened_callbacks_.push_back( | |
195 base::Bind(&DOMStorageContextWrapper::BindLocalStorage, | |
196 weak_ptr_factory_.GetWeakPtr(), | |
197 origin, | |
198 base::Passed(&observer), | |
199 base::Passed(&request))); | |
200 return; | |
201 } | |
202 | |
203 BindLocalStorage(origin, std::move(observer), std::move(request)); | |
204 } | |
205 | |
206 void DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings( | |
207 const std::string& origin) { | |
208 // The DCHECK here broke on chrome-extensions. | |
209 level_db_wrappers_.erase(origin); | |
210 } | |
211 | |
212 void DOMStorageContextWrapper::OnDirectoryOpened(filesystem::FileError err) { | |
michaeln
2016/02/26 21:59:25
what about err checking
| |
213 // Now that we have a directory, connect to the LevelDB service and get our | |
214 // database. | |
215 leveldb_connection_ = content::MojoAppConnection::Create( | |
michaeln
2016/02/26 21:59:24
This ends up invoking the CreateLevelDbApp() funct
Elliot Glaysher
2016/03/02 23:06:19
I believe so. We connect to leveldb here, and then
| |
216 GURL("mojo:leveldb"), GURL(content::kBrowserMojoAppUrl)); | |
217 leveldb_connection_->GetInterface(&leveldb_); | |
218 | |
219 leveldb_->Open(std::move(directory_), "dom_storage", GetProxy(&database_), | |
220 base::Bind(&DOMStorageContextWrapper::OnDatabaseOpened, | |
221 weak_ptr_factory_.GetWeakPtr())); | |
222 } | |
223 | |
224 void DOMStorageContextWrapper::OnDatabaseOpened(leveldb::DatabaseError status) { | |
michaeln
2016/02/26 21:59:25
what about status checking?
| |
225 // |database_| should be valid now. Run our delayed bindings. | |
226 connection_state_ = CONNECTED; | |
227 for (size_t i = 0; i < on_database_opened_callbacks_.size(); ++i) | |
228 on_database_opened_callbacks_[i].Run(); | |
229 on_database_opened_callbacks_.clear(); | |
230 } | |
231 | |
232 void DOMStorageContextWrapper::BindLocalStorage( | |
233 const mojo::String& origin, | |
234 LevelDBObserverPtr observer, | |
235 mojo::InterfaceRequest<LevelDBWrapper> request) { | |
174 if (level_db_wrappers_.find(origin) == level_db_wrappers_.end()) { | 236 if (level_db_wrappers_.find(origin) == level_db_wrappers_.end()) { |
175 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl( | 237 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl( |
238 database_.get(), | |
176 origin, | 239 origin, |
177 base::Bind(&DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings, | 240 base::Bind(&DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings, |
178 base::Unretained(this), | 241 base::Unretained(this), |
179 origin.get()))); | 242 origin.get()))); |
180 } | 243 } |
181 // TODO(jam): call LevelDB service (once per this object) to open the database | |
182 // for LocalStorage and keep a pointer to it in this class. Then keep a map | |
183 // from origins to LevelDBWrapper object. Each call here for the same origin | |
184 // should use the same LevelDBWrapper object. | |
185 | 244 |
186 level_db_wrappers_[origin]->Bind(std::move(request), std::move(observer)); | 245 level_db_wrappers_[origin]->Bind(std::move(request), std::move(observer)); |
187 } | 246 } |
188 | 247 |
189 void DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings( | |
190 const std::string& origin) { | |
191 DCHECK(level_db_wrappers_.find(origin) != level_db_wrappers_.end()); | |
192 level_db_wrappers_.erase(origin); | |
193 } | |
194 | |
195 } // namespace content | 248 } // namespace content |
OLD | NEW |