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

Unified Diff: content/browser/loader/mojo_async_resource_handler.cc

Issue 2466843002: Cancel the request when URLLoader is gone (Closed)
Patch Set: fix Created 4 years, 1 month 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: content/browser/loader/mojo_async_resource_handler.cc
diff --git a/content/browser/loader/mojo_async_resource_handler.cc b/content/browser/loader/mojo_async_resource_handler.cc
index e18c7dccbddbce48be037287932cb510e967a894..5fe1ed6a7f7f159672567ca7f64e9e4afcd644ed 100644
--- a/content/browser/loader/mojo_async_resource_handler.cc
+++ b/content/browser/loader/mojo_async_resource_handler.cc
@@ -16,6 +16,7 @@
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader/resource_request_info_impl.h"
#include "content/common/resource_request_completion_status.h"
+#include "content/public/browser/global_request_id.h"
#include "content/public/browser/resource_dispatcher_host_delegate.h"
#include "content/public/common/resource_response.h"
#include "mojo/public/c/system/data_pipe.h"
@@ -111,6 +112,10 @@ MojoAsyncResourceHandler::MojoAsyncResourceHandler(
url_loader_client_(std::move(url_loader_client)) {
DCHECK(url_loader_client_);
InitializeResourceBufferConstants();
+ // This unretained pointer is safe, because |binding_| is owned by |this| and
+ // the callback will never be called after |this| is destroyed.
+ binding_.set_connection_error_handler(
+ base::Bind(&MojoAsyncResourceHandler::Cancel, base::Unretained(this)));
}
MojoAsyncResourceHandler::~MojoAsyncResourceHandler() {
@@ -243,10 +248,6 @@ void MojoAsyncResourceHandler::FollowRedirect() {
NOTIMPLEMENTED();
}
-void MojoAsyncResourceHandler::Cancel() {
- NOTIMPLEMENTED();
-}
-
void MojoAsyncResourceHandler::ResumeForTesting() {
Resume();
}
@@ -400,4 +401,10 @@ void MojoAsyncResourceHandler::OnWritable(MojoResult unused) {
Resume();
}
+void MojoAsyncResourceHandler::Cancel() {
+ const ResourceRequestInfoImpl* info = GetRequestInfo();
+ ResourceDispatcherHostImpl::Get()->CancelRequestFromRenderer(
+ GlobalRequestID(info->GetChildID(), info->GetRequestID()));
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698