| 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 "components/webdata/common/web_database_service.h" | 5 #include "components/webdata/common/web_database_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 } | 87 } |
| 88 | 88 |
| 89 scoped_refptr<WebDatabaseBackend> WebDatabaseService::GetBackend() const { | 89 scoped_refptr<WebDatabaseBackend> WebDatabaseService::GetBackend() const { |
| 90 return web_db_backend_; | 90 return web_db_backend_; |
| 91 } | 91 } |
| 92 | 92 |
| 93 void WebDatabaseService::ScheduleDBTask( | 93 void WebDatabaseService::ScheduleDBTask( |
| 94 const tracked_objects::Location& from_here, | 94 const tracked_objects::Location& from_here, |
| 95 const WriteTask& task) { | 95 const WriteTask& task) { |
| 96 DCHECK(web_db_backend_.get()); | 96 DCHECK(web_db_backend_.get()); |
| 97 std::unique_ptr<WebDataRequest> request( | 97 std::unique_ptr<WebDataRequest> request = |
| 98 new WebDataRequest(NULL, web_db_backend_->request_manager().get())); | 98 web_db_backend_->request_manager()->NewRequest(nullptr); |
| 99 db_thread_->PostTask( | 99 db_thread_->PostTask( |
| 100 from_here, Bind(&WebDatabaseBackend::DBWriteTaskWrapper, web_db_backend_, | 100 from_here, Bind(&WebDatabaseBackend::DBWriteTaskWrapper, web_db_backend_, |
| 101 task, base::Passed(&request))); | 101 task, base::Passed(&request))); |
| 102 } | 102 } |
| 103 | 103 |
| 104 WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult( | 104 WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult( |
| 105 const tracked_objects::Location& from_here, | 105 const tracked_objects::Location& from_here, |
| 106 const ReadTask& task, | 106 const ReadTask& task, |
| 107 WebDataServiceConsumer* consumer) { | 107 WebDataServiceConsumer* consumer) { |
| 108 DCHECK(consumer); | 108 DCHECK(consumer); |
| 109 DCHECK(web_db_backend_.get()); | 109 DCHECK(web_db_backend_.get()); |
| 110 std::unique_ptr<WebDataRequest> request( | 110 std::unique_ptr<WebDataRequest> request = |
| 111 new WebDataRequest(consumer, web_db_backend_->request_manager().get())); | 111 web_db_backend_->request_manager()->NewRequest(consumer); |
| 112 WebDataServiceBase::Handle handle = request->GetHandle(); | 112 WebDataServiceBase::Handle handle = request->GetHandle(); |
| 113 db_thread_->PostTask( | 113 db_thread_->PostTask( |
| 114 from_here, Bind(&WebDatabaseBackend::DBReadTaskWrapper, web_db_backend_, | 114 from_here, Bind(&WebDatabaseBackend::DBReadTaskWrapper, web_db_backend_, |
| 115 task, base::Passed(&request))); | 115 task, base::Passed(&request))); |
| 116 return handle; | 116 return handle; |
| 117 } | 117 } |
| 118 | 118 |
| 119 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) { | 119 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) { |
| 120 if (!web_db_backend_.get()) | 120 if (!web_db_backend_.get()) |
| 121 return; | 121 return; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 db_loaded_ = true; | 155 db_loaded_ = true; |
| 156 | 156 |
| 157 while (!loaded_callbacks_.empty()) { | 157 while (!loaded_callbacks_.empty()) { |
| 158 DBLoadedCallback loaded_callback = loaded_callbacks_.back(); | 158 DBLoadedCallback loaded_callback = loaded_callbacks_.back(); |
| 159 loaded_callbacks_.pop_back(); | 159 loaded_callbacks_.pop_back(); |
| 160 if (!loaded_callback.is_null()) | 160 if (!loaded_callback.is_null()) |
| 161 loaded_callback.Run(); | 161 loaded_callback.Run(); |
| 162 } | 162 } |
| 163 } | 163 } |
| 164 } | 164 } |
| OLD | NEW |