| Index: content/browser/loader/cross_site_resource_handler.cc
|
| ===================================================================
|
| --- content/browser/loader/cross_site_resource_handler.cc (revision 251072)
|
| +++ content/browser/loader/cross_site_resource_handler.cc (working copy)
|
| @@ -173,7 +173,8 @@
|
| StartCrossSiteTransition(request_id, response, should_transfer);
|
|
|
| // Defer loading until after the onunload event handler has run.
|
| - did_defer_ = *defer = true;
|
| + *defer = true;
|
| + OnDidDefer();
|
| return true;
|
| }
|
|
|
| @@ -217,8 +218,8 @@
|
|
|
| // Defer to tell RDH not to notify the world or clean up the pending request.
|
| // We will do so in ResumeResponse.
|
| - did_defer_ = true;
|
| *defer = true;
|
| + OnDidDefer();
|
| }
|
|
|
| // We can now send the response to the new renderer, which will cause
|
| @@ -311,9 +312,15 @@
|
|
|
| void CrossSiteResourceHandler::ResumeIfDeferred() {
|
| if (did_defer_) {
|
| + request()->LogUnblocked();
|
| did_defer_ = false;
|
| controller()->Resume();
|
| }
|
| }
|
|
|
| +void CrossSiteResourceHandler::OnDidDefer() {
|
| + did_defer_ = true;
|
| + request()->LogBlockedBy("CrossSiteResourceHandler");
|
| +}
|
| +
|
| } // namespace content
|
|
|