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/leveldb_wrapper_impl.h" | 21 #include "content/browser/leveldb_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/common/common_type_converters.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 26 matching lines...) Expand all Loading... | |
60 new std::vector<SessionStorageUsageInfo>; | 63 new std::vector<SessionStorageUsageInfo>; |
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( |
73 uint32_t mojo_user_id, | |
70 const base::FilePath& data_path, | 74 const base::FilePath& data_path, |
71 storage::SpecialStoragePolicy* special_storage_policy) { | 75 storage::SpecialStoragePolicy* special_storage_policy) |
76 : mojo_user_id_(mojo_user_id), | |
77 connection_state_(NO_CONNECTION), | |
78 weak_ptr_factory_(this) { | |
72 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); | 79 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); |
73 context_ = new DOMStorageContextImpl( | 80 context_ = new DOMStorageContextImpl( |
74 data_path.empty() ? data_path | 81 data_path.empty() ? data_path |
75 : data_path.AppendASCII(kLocalStorageDirectory), | 82 : data_path.AppendASCII(kLocalStorageDirectory), |
76 data_path.empty() ? data_path | 83 data_path.empty() ? data_path |
77 : data_path.AppendASCII(kSessionStorageDirectory), | 84 : data_path.AppendASCII(kSessionStorageDirectory), |
78 special_storage_policy, | 85 special_storage_policy, |
79 new DOMStorageWorkerPoolTaskRunner( | 86 new DOMStorageWorkerPoolTaskRunner( |
80 worker_pool, | 87 worker_pool, |
81 worker_pool->GetNamedSequenceToken("dom_storage_primary"), | 88 worker_pool->GetNamedSequenceToken("dom_storage_primary"), |
82 worker_pool->GetNamedSequenceToken("dom_storage_commit"), | 89 worker_pool->GetNamedSequenceToken("dom_storage_commit"), |
83 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO) | 90 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO) |
84 .get())); | 91 .get())); |
85 } | 92 } |
86 | 93 |
87 DOMStorageContextWrapper::~DOMStorageContextWrapper() { | 94 DOMStorageContextWrapper::~DOMStorageContextWrapper() {} |
88 } | |
89 | 95 |
90 void DOMStorageContextWrapper::GetLocalStorageUsage( | 96 void DOMStorageContextWrapper::GetLocalStorageUsage( |
91 const GetLocalStorageUsageCallback& callback) { | 97 const GetLocalStorageUsageCallback& callback) { |
92 DCHECK(context_.get()); | 98 DCHECK(context_.get()); |
93 context_->task_runner()->PostShutdownBlockingTask( | 99 context_->task_runner()->PostShutdownBlockingTask( |
94 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, | 100 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
95 base::Bind(&GetLocalStorageUsageHelper, | 101 base::Bind(&GetLocalStorageUsageHelper, |
96 base::ThreadTaskRunnerHandle::Get(), context_, callback)); | 102 base::ThreadTaskRunnerHandle::Get(), context_, callback)); |
97 } | 103 } |
98 | 104 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
163 void DOMStorageContextWrapper::Flush() { | 169 void DOMStorageContextWrapper::Flush() { |
164 DCHECK(context_.get()); | 170 DCHECK(context_.get()); |
165 context_->task_runner()->PostShutdownBlockingTask( | 171 context_->task_runner()->PostShutdownBlockingTask( |
166 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, | 172 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
167 base::Bind(&DOMStorageContextImpl::Flush, context_)); | 173 base::Bind(&DOMStorageContextImpl::Flush, context_)); |
168 } | 174 } |
169 | 175 |
170 void DOMStorageContextWrapper::OpenLocalStorage( | 176 void DOMStorageContextWrapper::OpenLocalStorage( |
171 const mojo::String& origin, | 177 const mojo::String& origin, |
172 mojo::InterfaceRequest<LevelDBWrapper> request) { | 178 mojo::InterfaceRequest<LevelDBWrapper> request) { |
173 if (level_db_wrappers_.find(origin) == level_db_wrappers_.end()) { | 179 // If we don't have a filesystem_connection_, we'll need to establish one. |
174 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl( | 180 if (connection_state_ == NO_CONNECTION) { |
175 origin, | 181 profile_connection_ = MojoAppConnection::Create( |
176 base::Bind(&DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings, | 182 mojo_user_id_, "mojo:profile", kBrowserMojoAppUrl); |
177 base::Unretained(this), | 183 profile_connection_->GetInterface(&profile_service_); |
178 origin.get()))); | 184 |
185 profile_service_->GetDirectory( | |
186 GetProxy(&directory_), | |
187 base::Bind(&DOMStorageContextWrapper::OnDirectoryOpened, | |
188 weak_ptr_factory_.GetWeakPtr())); | |
189 connection_state_ = CONNECITON_IN_PROGRESS; | |
michaeln
2016/03/05 01:38:54
Stupid mojo question?
The GetDirectory callback a
Elliot Glaysher
2016/03/10 21:00:35
I believe so. I tried that first, but had issues s
| |
179 } | 190 } |
180 // TODO(jam): call LevelDB service (once per this object) to open the database | |
181 // for LocalStorage and keep a pointer to it in this class. Then keep a map | |
182 // from origins to LevelDBWrapper object. Each call here for the same origin | |
183 // should use the same LevelDBWrapper object. | |
184 | 191 |
185 level_db_wrappers_[origin]->Bind(std::move(request)); | 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(&request))); | |
199 return; | |
200 } | |
201 | |
202 BindLocalStorage(origin, std::move(request)); | |
186 } | 203 } |
187 | 204 |
188 void DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings( | 205 void DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings( |
189 const std::string& origin) { | 206 const std::string& origin) { |
190 DCHECK(level_db_wrappers_.find(origin) != level_db_wrappers_.end()); | 207 DCHECK(level_db_wrappers_.find(origin) != level_db_wrappers_.end()); |
191 level_db_wrappers_.erase(origin); | 208 level_db_wrappers_.erase(origin); |
192 } | 209 } |
193 | 210 |
211 void DOMStorageContextWrapper::OnDirectoryOpened(filesystem::FileError err) { | |
212 if (err != filesystem::FileError::OK) { | |
213 NOTREACHED(); | |
214 return; | |
215 } | |
216 | |
217 // Now that we have a directory, connect to the LevelDB service and get our | |
218 // database. | |
219 leveldb_connection_ = MojoAppConnection::Create( | |
220 mojo_user_id_, "mojo:leveldb", kBrowserMojoAppUrl); | |
221 leveldb_connection_->GetInterface(&leveldb_); | |
222 | |
223 leveldb_->Open(std::move(directory_), "local_storage", GetProxy(&database_), | |
224 base::Bind(&DOMStorageContextWrapper::OnDatabaseOpened, | |
225 weak_ptr_factory_.GetWeakPtr())); | |
226 } | |
227 | |
228 void DOMStorageContextWrapper::OnDatabaseOpened(leveldb::DatabaseError status) { | |
229 if (status != leveldb::DatabaseError::OK) { | |
230 NOTREACHED(); | |
231 return; | |
232 } | |
233 | |
234 // |database_| should be valid now. Run our delayed bindings. | |
235 connection_state_ = CONNECTED; | |
236 for (size_t i = 0; i < on_database_opened_callbacks_.size(); ++i) | |
237 on_database_opened_callbacks_[i].Run(); | |
238 on_database_opened_callbacks_.clear(); | |
239 } | |
240 | |
241 void DOMStorageContextWrapper::BindLocalStorage( | |
242 const mojo::String& origin, | |
243 mojo::InterfaceRequest<LevelDBWrapper> request) { | |
244 if (level_db_wrappers_.find(origin) == level_db_wrappers_.end()) { | |
245 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl( | |
246 database_.get(), | |
247 origin, | |
248 base::Bind(&DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings, | |
249 base::Unretained(this), | |
250 origin.get()))); | |
251 } | |
252 | |
253 level_db_wrappers_[origin]->Bind(std::move(request)); | |
254 } | |
255 | |
194 } // namespace content | 256 } // namespace content |
OLD | NEW |