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

Side by Side Diff: content/browser/dom_storage/dom_storage_context_wrapper.cc

Issue 1737933002: mojo leveldb: Get profile and leveldb connected to DOMStorageContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove most of the LOGs. Created 4 years, 9 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
OLDNEW
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"
22 #include "content/public/browser/browser_context.h"
21 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/local_storage_usage_info.h" 24 #include "content/public/browser/local_storage_usage_info.h"
25 #include "content/public/browser/mojo_app_connection.h"
23 #include "content/public/browser/session_storage_usage_info.h" 26 #include "content/public/browser/session_storage_usage_info.h"
27 #include "mojo/common/common_type_converters.h"
24 28
25 namespace content { 29 namespace content {
26 namespace { 30 namespace {
27 31
28 const char kLocalStorageDirectory[] = "Local Storage"; 32 const char kLocalStorageDirectory[] = "Local Storage";
29 const char kSessionStorageDirectory[] = "Session Storage"; 33 const char kSessionStorageDirectory[] = "Session Storage";
30 34
31 void InvokeLocalStorageUsageCallbackHelper( 35 void InvokeLocalStorageUsageCallbackHelper(
32 const DOMStorageContext::GetLocalStorageUsageCallback& callback, 36 const DOMStorageContext::GetLocalStorageUsageCallback& callback,
33 const std::vector<LocalStorageUsageInfo>* infos) { 37 const std::vector<LocalStorageUsageInfo>* infos) {
(...skipping 26 matching lines...) Expand all
60 new std::vector<SessionStorageUsageInfo>; 64 new std::vector<SessionStorageUsageInfo>;
61 context->GetSessionStorageUsage(infos); 65 context->GetSessionStorageUsage(infos);
62 reply_task_runner->PostTask( 66 reply_task_runner->PostTask(
63 FROM_HERE, base::Bind(&InvokeSessionStorageUsageCallbackHelper, callback, 67 FROM_HERE, base::Bind(&InvokeSessionStorageUsageCallbackHelper, callback,
64 base::Owned(infos))); 68 base::Owned(infos)));
65 } 69 }
66 70
67 } // namespace 71 } // namespace
68 72
69 DOMStorageContextWrapper::DOMStorageContextWrapper( 73 DOMStorageContextWrapper::DOMStorageContextWrapper(
74 BrowserContext* context,
70 const base::FilePath& data_path, 75 const base::FilePath& data_path,
71 storage::SpecialStoragePolicy* special_storage_policy) { 76 storage::SpecialStoragePolicy* special_storage_policy)
77 : browser_context_(context),
78 connection_state_(NO_CONNECTION),
79 weak_ptr_factory_(this) {
72 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); 80 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool();
73 context_ = new DOMStorageContextImpl( 81 context_ = new DOMStorageContextImpl(
74 data_path.empty() ? data_path 82 data_path.empty() ? data_path
75 : data_path.AppendASCII(kLocalStorageDirectory), 83 : data_path.AppendASCII(kLocalStorageDirectory),
76 data_path.empty() ? data_path 84 data_path.empty() ? data_path
77 : data_path.AppendASCII(kSessionStorageDirectory), 85 : data_path.AppendASCII(kSessionStorageDirectory),
78 special_storage_policy, 86 special_storage_policy,
79 new DOMStorageWorkerPoolTaskRunner( 87 new DOMStorageWorkerPoolTaskRunner(
80 worker_pool, 88 worker_pool,
81 worker_pool->GetNamedSequenceToken("dom_storage_primary"), 89 worker_pool->GetNamedSequenceToken("dom_storage_primary"),
82 worker_pool->GetNamedSequenceToken("dom_storage_commit"), 90 worker_pool->GetNamedSequenceToken("dom_storage_commit"),
83 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO) 91 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)
84 .get())); 92 .get()));
85 } 93 }
86 94
87 DOMStorageContextWrapper::~DOMStorageContextWrapper() { 95 DOMStorageContextWrapper::~DOMStorageContextWrapper() {
96 LOG(ERROR) << "Size of level_db_wrappers_: " << level_db_wrappers_.size();
jam 2016/03/03 16:32:10 nit: change from LOG(ERROR) to something else that
88 } 97 }
89 98
90 void DOMStorageContextWrapper::GetLocalStorageUsage( 99 void DOMStorageContextWrapper::GetLocalStorageUsage(
91 const GetLocalStorageUsageCallback& callback) { 100 const GetLocalStorageUsageCallback& callback) {
92 DCHECK(context_.get()); 101 DCHECK(context_.get());
93 context_->task_runner()->PostShutdownBlockingTask( 102 context_->task_runner()->PostShutdownBlockingTask(
94 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, 103 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE,
95 base::Bind(&GetLocalStorageUsageHelper, 104 base::Bind(&GetLocalStorageUsageHelper,
96 base::ThreadTaskRunnerHandle::Get(), context_, callback)); 105 base::ThreadTaskRunnerHandle::Get(), context_, callback));
97 } 106 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 void DOMStorageContextWrapper::Flush() { 172 void DOMStorageContextWrapper::Flush() {
164 DCHECK(context_.get()); 173 DCHECK(context_.get());
165 context_->task_runner()->PostShutdownBlockingTask( 174 context_->task_runner()->PostShutdownBlockingTask(
166 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, 175 FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE,
167 base::Bind(&DOMStorageContextImpl::Flush, context_)); 176 base::Bind(&DOMStorageContextImpl::Flush, context_));
168 } 177 }
169 178
170 void DOMStorageContextWrapper::OpenLocalStorage( 179 void DOMStorageContextWrapper::OpenLocalStorage(
171 const mojo::String& origin, 180 const mojo::String& origin,
172 mojo::InterfaceRequest<LevelDBWrapper> request) { 181 mojo::InterfaceRequest<LevelDBWrapper> request) {
182 // If we don't have a filesystem_connection_, we'll need to establish one.
183 if (connection_state_ == NO_CONNECTION) {
184 profile_connection_ = content::MojoAppConnection::Create(
jam 2016/03/03 16:32:10 nit: here and in other places in the file, no need
185 browser_context_, "mojo:profile", content::kBrowserMojoAppUrl);
186 profile_connection_->GetInterface(&profile_service_);
187
188 profile_service_->GetDirectory(
189 GetProxy(&directory_),
190 base::Bind(&DOMStorageContextWrapper::OnDirectoryOpened,
191 weak_ptr_factory_.GetWeakPtr()));
192 connection_state_ = CONNECITON_IN_PROGRESS;
193 }
194
195 if (connection_state_ == CONNECITON_IN_PROGRESS) {
196 // Queue this OpenLocalStorage call for when we have a level db pointer.
197 on_database_opened_callbacks_.push_back(
198 base::Bind(&DOMStorageContextWrapper::BindLocalStorage,
199 weak_ptr_factory_.GetWeakPtr(),
200 origin,
201 base::Passed(&request)));
202 return;
203 }
204
205 BindLocalStorage(origin, std::move(request));
206 }
207
208 void DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings(
209 const std::string& origin) {
210 // The DCHECK here broke on chrome-extensions.
jam 2016/03/03 16:32:10 can you explain this some more? I don't understand
Elliot Glaysher 2016/03/04 18:42:43 Fixing shutdown elsewhere fixed this. Changed back
211 level_db_wrappers_.erase(origin);
212 }
213
214 void DOMStorageContextWrapper::OnDirectoryOpened(filesystem::FileError err) {
215 if (err != filesystem::FileError::OK) {
216 NOTREACHED();
217 return;
218 }
219
220 // Now that we have a directory, connect to the LevelDB service and get our
221 // database.
222 leveldb_connection_ = content::MojoAppConnection::Create(
223 browser_context_, "mojo:leveldb", content::kBrowserMojoAppUrl);
224 leveldb_connection_->GetInterface(&leveldb_);
225
226 leveldb_->Open(std::move(directory_), "dom_storage", GetProxy(&database_),
jam 2016/03/03 16:32:10 s/dom_storage/local_storage "dom_storage" in the
227 base::Bind(&DOMStorageContextWrapper::OnDatabaseOpened,
228 weak_ptr_factory_.GetWeakPtr()));
229 }
230
231 void DOMStorageContextWrapper::OnDatabaseOpened(leveldb::DatabaseError status) {
232 if (status != leveldb::DatabaseError::OK) {
233 NOTREACHED();
234 return;
235 }
236
237 // Tear down the profile connection now; we no longer need it.
238 directory_.reset();
239 profile_service_.reset();
240 profile_connection_.reset();
241
242 // |database_| should be valid now. Run our delayed bindings.
243 connection_state_ = CONNECTED;
244 for (size_t i = 0; i < on_database_opened_callbacks_.size(); ++i)
245 on_database_opened_callbacks_[i].Run();
246 on_database_opened_callbacks_.clear();
247
248 database_->Put(mojo::Array<uint8_t>::From(std::string("key")),
249 mojo::Array<uint8_t>::From(std::string("value")),
250 base::Bind(&DOMStorageContextWrapper::OnCrudWritten,
251 weak_ptr_factory_.GetWeakPtr()));
252 }
253
254 void DOMStorageContextWrapper::OnCrudWritten(leveldb::DatabaseError status) {
255 LOG(ERROR) << "Writing some crud to dom storage: " << status;
256 }
257
258 void DOMStorageContextWrapper::BindLocalStorage(
259 const mojo::String& origin,
260 mojo::InterfaceRequest<LevelDBWrapper> request) {
173 if (level_db_wrappers_.find(origin) == level_db_wrappers_.end()) { 261 if (level_db_wrappers_.find(origin) == level_db_wrappers_.end()) {
174 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl( 262 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl(
263 database_.get(),
175 origin, 264 origin,
176 base::Bind(&DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings, 265 base::Bind(&DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings,
177 base::Unretained(this), 266 base::Unretained(this),
178 origin.get()))); 267 origin.get())));
179 } 268 }
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 269
185 level_db_wrappers_[origin]->Bind(std::move(request)); 270 level_db_wrappers_[origin]->Bind(std::move(request));
186 } 271 }
187 272
188 void DOMStorageContextWrapper::LevelDBWrapperImplHasNoBindings(
189 const std::string& origin) {
190 DCHECK(level_db_wrappers_.find(origin) != level_db_wrappers_.end());
191 level_db_wrappers_.erase(origin);
192 }
193
194 } // namespace content 273 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698