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

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

Issue 545353002: Fix a DCHECK triggered by DetachableResourceLoader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/detachable_resource_handler.cc
diff --git a/content/browser/loader/detachable_resource_handler.cc b/content/browser/loader/detachable_resource_handler.cc
index 4b0641b30fc7dcdbec634593361b8bd82ed75637..ab7e240b1ee0b9f8d8703892c361bbf5c933b146 100644
--- a/content/browser/loader/detachable_resource_handler.cc
+++ b/content/browser/loader/detachable_resource_handler.cc
@@ -9,6 +9,7 @@
#include "content/browser/loader/resource_request_info_impl.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
+#include "net/url_request/url_request.h"
#include "net/url_request/url_request_status.h"
namespace {
@@ -69,8 +70,12 @@ void DetachableResourceHandler::Detach() {
// Resume if necessary. The request may have been deferred, say, waiting on a
// full buffer in AsyncResourceHandler. Now that it has been detached, resume
// 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();
+ }
}
void DetachableResourceHandler::SetController(ResourceController* controller) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698