Commit 5c27061d authored by mmenke's avatar mmenke Committed by Commit bot

Fix a DCHECK triggered by DetachableResourceHandler

under certain circumstances, when resuming a request.

BUG=411228

Review URL: https://codereview.chromium.org/545353002

Cr-Commit-Position: refs/heads/master@{#293822}
parent 8a021cc9
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "content/browser/loader/resource_request_info_impl.h" #include "content/browser/loader/resource_request_info_impl.h"
#include "net/base/io_buffer.h" #include "net/base/io_buffer.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_status.h" #include "net/url_request/url_request_status.h"
namespace { namespace {
...@@ -69,8 +70,12 @@ void DetachableResourceHandler::Detach() { ...@@ -69,8 +70,12 @@ void DetachableResourceHandler::Detach() {
// Resume if necessary. The request may have been deferred, say, waiting on a // Resume if necessary. The request may have been deferred, say, waiting on a
// full buffer in AsyncResourceHandler. Now that it has been detached, resume // full buffer in AsyncResourceHandler. Now that it has been detached, resume
// and drain it. // and drain it.
if (is_deferred_) if (is_deferred_) {
// The nested ResourceHandler may have logged that it's blocking the
// request. Log it as no longer doing so, to avoid a DCHECK on resume.
request()->LogUnblocked();
Resume(); Resume();
}
} }
void DetachableResourceHandler::SetController(ResourceController* controller) { void DetachableResourceHandler::SetController(ResourceController* controller) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment