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

Side by Side Diff: components/webdata/common/web_database_service.cc

Issue 500383003: Remove implicit conversions from scoped_refptr to T* in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « components/usb_service/usb_device_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/webdata/common/web_database_service.h" 5 #include "components/webdata/common/web_database_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "components/webdata/common/web_data_request_manager.h" 9 #include "components/webdata/common/web_data_request_manager.h"
10 #include "components/webdata/common/web_data_results.h" 10 #include "components/webdata/common/web_data_results.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // WebDatabaseService should be instantiated on UI thread. 49 // WebDatabaseService should be instantiated on UI thread.
50 DCHECK(ui_thread->BelongsToCurrentThread()); 50 DCHECK(ui_thread->BelongsToCurrentThread());
51 // WebDatabaseService requires DB thread if instantiated. 51 // WebDatabaseService requires DB thread if instantiated.
52 DCHECK(db_thread.get()); 52 DCHECK(db_thread.get());
53 } 53 }
54 54
55 WebDatabaseService::~WebDatabaseService() { 55 WebDatabaseService::~WebDatabaseService() {
56 } 56 }
57 57
58 void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) { 58 void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) {
59 if (!wds_backend_) { 59 if (!wds_backend_.get()) {
60 wds_backend_ = new WebDataServiceBackend( 60 wds_backend_ = new WebDataServiceBackend(
61 path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), 61 path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()),
62 db_thread_); 62 db_thread_);
63 } 63 }
64 wds_backend_->AddTable(table.Pass()); 64 wds_backend_->AddTable(table.Pass());
65 } 65 }
66 66
67 void WebDatabaseService::LoadDatabase() { 67 void WebDatabaseService::LoadDatabase() {
68 DCHECK(wds_backend_); 68 DCHECK(wds_backend_.get());
69 db_thread_->PostTask( 69 db_thread_->PostTask(
70 FROM_HERE, 70 FROM_HERE,
71 Bind(&WebDataServiceBackend::InitDatabase, wds_backend_)); 71 Bind(&WebDataServiceBackend::InitDatabase, wds_backend_));
Cait (Slow) 2014/08/26 18:01:35 Do scoped_refptr's in Bind() calls need to be made
dcheng 2014/08/26 18:09:38 It depends on how it's being bound. In that partic
72 } 72 }
73 73
74 void WebDatabaseService::ShutdownDatabase() { 74 void WebDatabaseService::ShutdownDatabase() {
75 db_loaded_ = false; 75 db_loaded_ = false;
76 loaded_callbacks_.clear(); 76 loaded_callbacks_.clear();
77 error_callbacks_.clear(); 77 error_callbacks_.clear();
78 weak_ptr_factory_.InvalidateWeakPtrs(); 78 weak_ptr_factory_.InvalidateWeakPtrs();
79 if (!wds_backend_) 79 if (!wds_backend_.get())
80 return; 80 return;
81 db_thread_->PostTask( 81 db_thread_->PostTask(
82 FROM_HERE, Bind(&WebDataServiceBackend::ShutdownDatabase, wds_backend_)); 82 FROM_HERE, Bind(&WebDataServiceBackend::ShutdownDatabase, wds_backend_));
83 } 83 }
84 84
85 WebDatabase* WebDatabaseService::GetDatabaseOnDB() const { 85 WebDatabase* WebDatabaseService::GetDatabaseOnDB() const {
86 DCHECK(db_thread_->BelongsToCurrentThread()); 86 DCHECK(db_thread_->BelongsToCurrentThread());
87 return wds_backend_ ? wds_backend_->database() : NULL; 87 return wds_backend_.get() ? wds_backend_->database() : NULL;
88 } 88 }
89 89
90 scoped_refptr<WebDataServiceBackend> WebDatabaseService::GetBackend() const { 90 scoped_refptr<WebDataServiceBackend> WebDatabaseService::GetBackend() const {
91 return wds_backend_; 91 return wds_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(wds_backend_); 97 DCHECK(wds_backend_.get());
98 scoped_ptr<WebDataRequest> request( 98 scoped_ptr<WebDataRequest> request(
99 new WebDataRequest(NULL, wds_backend_->request_manager().get())); 99 new WebDataRequest(NULL, wds_backend_->request_manager().get()));
100 db_thread_->PostTask(from_here, 100 db_thread_->PostTask(from_here,
101 Bind(&WebDataServiceBackend::DBWriteTaskWrapper, 101 Bind(&WebDataServiceBackend::DBWriteTaskWrapper,
102 wds_backend_, task, base::Passed(&request))); 102 wds_backend_, 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(wds_backend_); 110 DCHECK(wds_backend_.get());
111 scoped_ptr<WebDataRequest> request( 111 scoped_ptr<WebDataRequest> request(
112 new WebDataRequest(consumer, wds_backend_->request_manager().get())); 112 new WebDataRequest(consumer, wds_backend_->request_manager().get()));
113 WebDataServiceBase::Handle handle = request->GetHandle(); 113 WebDataServiceBase::Handle handle = request->GetHandle();
114 db_thread_->PostTask(from_here, 114 db_thread_->PostTask(from_here,
115 Bind(&WebDataServiceBackend::DBReadTaskWrapper, 115 Bind(&WebDataServiceBackend::DBReadTaskWrapper,
116 wds_backend_, task, base::Passed(&request))); 116 wds_backend_, 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 (!wds_backend_) 121 if (!wds_backend_.get())
122 return; 122 return;
123 wds_backend_->request_manager()->CancelRequest(h); 123 wds_backend_->request_manager()->CancelRequest(h);
124 } 124 }
125 125
126 void WebDatabaseService::RegisterDBLoadedCallback( 126 void WebDatabaseService::RegisterDBLoadedCallback(
127 const DBLoadedCallback& callback) { 127 const DBLoadedCallback& callback) {
128 loaded_callbacks_.push_back(callback); 128 loaded_callbacks_.push_back(callback);
129 } 129 }
130 130
131 void WebDatabaseService::RegisterDBErrorCallback( 131 void WebDatabaseService::RegisterDBErrorCallback(
(...skipping 14 matching lines...) Expand all
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 }
OLDNEW
« no previous file with comments | « components/usb_service/usb_device_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698