| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 weak_ptr_factory_(this) { | 50 weak_ptr_factory_(this) { |
| 51 // WebDatabaseService should be instantiated on UI thread. | 51 // WebDatabaseService should be instantiated on UI thread. |
| 52 DCHECK(ui_thread->BelongsToCurrentThread()); | 52 DCHECK(ui_thread->BelongsToCurrentThread()); |
| 53 // WebDatabaseService requires DB thread if instantiated. | 53 // WebDatabaseService requires DB thread if instantiated. |
| 54 DCHECK(db_thread.get()); | 54 DCHECK(db_thread.get()); |
| 55 } | 55 } |
| 56 | 56 |
| 57 WebDatabaseService::~WebDatabaseService() { | 57 WebDatabaseService::~WebDatabaseService() { |
| 58 } | 58 } |
| 59 | 59 |
| 60 void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) { | 60 void WebDatabaseService::AddTable(std::unique_ptr<WebDatabaseTable> table) { |
| 61 if (!web_db_backend_.get()) { | 61 if (!web_db_backend_.get()) { |
| 62 web_db_backend_ = new WebDatabaseBackend( | 62 web_db_backend_ = new WebDatabaseBackend( |
| 63 path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), db_thread_); | 63 path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), db_thread_); |
| 64 } | 64 } |
| 65 web_db_backend_->AddTable(std::move(table)); | 65 web_db_backend_->AddTable(std::move(table)); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void WebDatabaseService::LoadDatabase() { | 68 void WebDatabaseService::LoadDatabase() { |
| 69 DCHECK(web_db_backend_.get()); | 69 DCHECK(web_db_backend_.get()); |
| 70 db_thread_->PostTask( | 70 db_thread_->PostTask( |
| (...skipping 17 matching lines...) Expand all Loading... |
| 88 } | 88 } |
| 89 | 89 |
| 90 scoped_refptr<WebDatabaseBackend> WebDatabaseService::GetBackend() const { | 90 scoped_refptr<WebDatabaseBackend> WebDatabaseService::GetBackend() const { |
| 91 return web_db_backend_; | 91 return web_db_backend_; |
| 92 } | 92 } |
| 93 | 93 |
| 94 void WebDatabaseService::ScheduleDBTask( | 94 void WebDatabaseService::ScheduleDBTask( |
| 95 const tracked_objects::Location& from_here, | 95 const tracked_objects::Location& from_here, |
| 96 const WriteTask& task) { | 96 const WriteTask& task) { |
| 97 DCHECK(web_db_backend_.get()); | 97 DCHECK(web_db_backend_.get()); |
| 98 scoped_ptr<WebDataRequest> request( | 98 std::unique_ptr<WebDataRequest> request( |
| 99 new WebDataRequest(NULL, web_db_backend_->request_manager().get())); | 99 new WebDataRequest(NULL, web_db_backend_->request_manager().get())); |
| 100 db_thread_->PostTask( | 100 db_thread_->PostTask( |
| 101 from_here, Bind(&WebDatabaseBackend::DBWriteTaskWrapper, web_db_backend_, | 101 from_here, Bind(&WebDatabaseBackend::DBWriteTaskWrapper, web_db_backend_, |
| 102 task, base::Passed(&request))); | 102 task, base::Passed(&request))); |
| 103 } | 103 } |
| 104 | 104 |
| 105 WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult( | 105 WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult( |
| 106 const tracked_objects::Location& from_here, | 106 const tracked_objects::Location& from_here, |
| 107 const ReadTask& task, | 107 const ReadTask& task, |
| 108 WebDataServiceConsumer* consumer) { | 108 WebDataServiceConsumer* consumer) { |
| 109 DCHECK(consumer); | 109 DCHECK(consumer); |
| 110 DCHECK(web_db_backend_.get()); | 110 DCHECK(web_db_backend_.get()); |
| 111 scoped_ptr<WebDataRequest> request( | 111 std::unique_ptr<WebDataRequest> request( |
| 112 new WebDataRequest(consumer, web_db_backend_->request_manager().get())); | 112 new WebDataRequest(consumer, web_db_backend_->request_manager().get())); |
| 113 WebDataServiceBase::Handle handle = request->GetHandle(); | 113 WebDataServiceBase::Handle handle = request->GetHandle(); |
| 114 db_thread_->PostTask( | 114 db_thread_->PostTask( |
| 115 from_here, Bind(&WebDatabaseBackend::DBReadTaskWrapper, web_db_backend_, | 115 from_here, Bind(&WebDatabaseBackend::DBReadTaskWrapper, web_db_backend_, |
| 116 task, base::Passed(&request))); | 116 task, base::Passed(&request))); |
| 117 return handle; | 117 return handle; |
| 118 } | 118 } |
| 119 | 119 |
| 120 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) { | 120 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) { |
| 121 if (!web_db_backend_.get()) | 121 if (!web_db_backend_.get()) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 146 } else { | 146 } else { |
| 147 // Notify that the database load failed. | 147 // Notify that the database load failed. |
| 148 for (size_t i = 0; i < error_callbacks_.size(); i++) { | 148 for (size_t i = 0; i < error_callbacks_.size(); i++) { |
| 149 if (!error_callbacks_[i].is_null()) | 149 if (!error_callbacks_[i].is_null()) |
| 150 error_callbacks_[i].Run(status); | 150 error_callbacks_[i].Run(status); |
| 151 } | 151 } |
| 152 | 152 |
| 153 error_callbacks_.clear(); | 153 error_callbacks_.clear(); |
| 154 } | 154 } |
| 155 } | 155 } |
| OLD | NEW |