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

Unified Diff: components/webdata/common/web_database_backend.cc

Issue 2571923002: Fix threading issues in WebDataRequestManager. (Closed)
Patch Set: fix a comment Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: components/webdata/common/web_database_backend.cc
diff --git a/components/webdata/common/web_database_backend.cc b/components/webdata/common/web_database_backend.cc
index a4446061f91307de7084ab03a4376ef5f0adfad7..7dbf642b029d522e01527616df63c55cc5b848fb 100644
--- a/components/webdata/common/web_database_backend.cc
+++ b/components/webdata/common/web_database_backend.cc
@@ -52,11 +52,11 @@ void WebDatabaseBackend::ShutdownDatabase() {
void WebDatabaseBackend::DBWriteTaskWrapper(
const WebDatabaseService::WriteTask& task,
std::unique_ptr<WebDataRequest> request) {
- if (request->IsCancelled())
+ if (!request->IsActive())
return;
ExecuteWriteTask(task);
- request_manager_->RequestCompleted(std::move(request));
+ request_manager_->RequestCompleted(std::move(request), nullptr);
}
void WebDatabaseBackend::ExecuteWriteTask(
@@ -72,11 +72,11 @@ void WebDatabaseBackend::ExecuteWriteTask(
void WebDatabaseBackend::DBReadTaskWrapper(
const WebDatabaseService::ReadTask& task,
std::unique_ptr<WebDataRequest> request) {
- if (request->IsCancelled())
+ if (!request->IsActive())
return;
- request->SetResult(ExecuteReadTask(task));
- request_manager_->RequestCompleted(std::move(request));
+ std::unique_ptr<WDTypedResult> result = ExecuteReadTask(task);
+ request_manager_->RequestCompleted(std::move(request), std::move(result));
}
std::unique_ptr<WDTypedResult> WebDatabaseBackend::ExecuteReadTask(
« no previous file with comments | « components/webdata/common/web_data_request_manager.cc ('k') | components/webdata/common/web_database_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698