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

Side by Side Diff: content/browser/loader/cross_site_resource_handler.cc

Issue 143183009: When cross-site navigations are cancelled, delete the request being transferred (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: *Really* remove AbortTransfer Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/cross_site_resource_handler.h" 5 #include "content/browser/loader/cross_site_resource_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "content/browser/child_process_security_policy_impl.h" 12 #include "content/browser/child_process_security_policy_impl.h"
13 #include "content/browser/cross_site_request_manager.h" 13 #include "content/browser/cross_site_request_manager.h"
14 #include "content/browser/loader/resource_dispatcher_host_impl.h" 14 #include "content/browser/loader/resource_dispatcher_host_impl.h"
15 #include "content/browser/loader/resource_request_info_impl.h" 15 #include "content/browser/loader/resource_request_info_impl.h"
16 #include "content/browser/renderer_host/cross_site_transferring_request.h"
16 #include "content/browser/renderer_host/render_view_host_delegate.h" 17 #include "content/browser/renderer_host/render_view_host_delegate.h"
17 #include "content/browser/renderer_host/render_view_host_impl.h" 18 #include "content/browser/renderer_host/render_view_host_impl.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/content_browser_client.h" 20 #include "content/public/browser/content_browser_client.h"
20 #include "content/public/browser/global_request_id.h" 21 #include "content/public/browser/global_request_id.h"
21 #include "content/public/browser/resource_controller.h" 22 #include "content/public/browser/resource_controller.h"
22 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
23 #include "content/public/common/resource_response.h" 24 #include "content/public/common/resource_response.h"
24 #include "content/public/common/url_constants.h" 25 #include "content/public/common/url_constants.h"
25 #include "net/http/http_response_headers.h" 26 #include "net/http/http_response_headers.h"
26 #include "net/url_request/url_request.h" 27 #include "net/url_request/url_request.h"
27 #include "webkit/browser/appcache/appcache_interceptor.h" 28 #include "webkit/browser/appcache/appcache_interceptor.h"
28 29
29 namespace content { 30 namespace content {
30 31
31 namespace { 32 namespace {
32 33
34 bool leak_requests_for_testing_ = false;
35
33 // The parameters to OnCrossSiteResponseHelper exceed the number of arguments 36 // The parameters to OnCrossSiteResponseHelper exceed the number of arguments
34 // base::Bind supports. 37 // base::Bind supports.
35 struct CrossSiteResponseParams { 38 struct CrossSiteResponseParams {
36 CrossSiteResponseParams(int render_view_id, 39 CrossSiteResponseParams(
37 const GlobalRequestID& global_request_id, 40 int render_view_id,
38 bool is_transfer, 41 const GlobalRequestID& global_request_id,
39 const std::vector<GURL>& transfer_url_chain, 42 bool is_transfer,
40 const Referrer& referrer, 43 const std::vector<GURL>& transfer_url_chain,
41 PageTransition page_transition, 44 const Referrer& referrer,
42 int64 frame_id, 45 PageTransition page_transition,
43 bool should_replace_current_entry) 46 int64 frame_id,
47 bool should_replace_current_entry)
44 : render_view_id(render_view_id), 48 : render_view_id(render_view_id),
45 global_request_id(global_request_id), 49 global_request_id(global_request_id),
46 is_transfer(is_transfer), 50 is_transfer(is_transfer),
47 transfer_url_chain(transfer_url_chain), 51 transfer_url_chain(transfer_url_chain),
48 referrer(referrer), 52 referrer(referrer),
49 page_transition(page_transition), 53 page_transition(page_transition),
50 frame_id(frame_id), 54 frame_id(frame_id),
51 should_replace_current_entry(should_replace_current_entry) { 55 should_replace_current_entry(should_replace_current_entry) {
52 } 56 }
53 57
54 int render_view_id; 58 int render_view_id;
55 GlobalRequestID global_request_id; 59 GlobalRequestID global_request_id;
56 bool is_transfer; 60 bool is_transfer;
57 std::vector<GURL> transfer_url_chain; 61 std::vector<GURL> transfer_url_chain;
58 Referrer referrer; 62 Referrer referrer;
59 PageTransition page_transition; 63 PageTransition page_transition;
60 int64 frame_id; 64 int64 frame_id;
61 bool should_replace_current_entry; 65 bool should_replace_current_entry;
62 }; 66 };
63 67
64 void OnCrossSiteResponseHelper(const CrossSiteResponseParams& params) { 68 void OnCrossSiteResponseHelper(const CrossSiteResponseParams& params) {
69 scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request;
70 if (params.is_transfer) {
71 cross_site_transferring_request.reset(new CrossSiteTransferringRequest(
72 params.global_request_id));
73 }
74
65 RenderViewHostImpl* rvh = 75 RenderViewHostImpl* rvh =
66 RenderViewHostImpl::FromID(params.global_request_id.child_id, 76 RenderViewHostImpl::FromID(params.global_request_id.child_id,
67 params.render_view_id); 77 params.render_view_id);
68 if (rvh) { 78 if (rvh) {
69 rvh->OnCrossSiteResponse( 79 rvh->OnCrossSiteResponse(
70 params.global_request_id, params.is_transfer, 80 params.global_request_id, cross_site_transferring_request.Pass(),
71 params.transfer_url_chain, params.referrer, 81 params.transfer_url_chain, params.referrer,
72 params.page_transition, params.frame_id, 82 params.page_transition, params.frame_id,
73 params.should_replace_current_entry); 83 params.should_replace_current_entry);
84 } else if (leak_requests_for_testing_ && cross_site_transferring_request) {
85 // Some unit tests expect requests to be leaked in this case, so they can
86 // pass them along manually.
87 cross_site_transferring_request->ReleaseRequest();
74 } 88 }
75 } 89 }
76 90
77 } // namespace 91 } // namespace
78 92
79 CrossSiteResourceHandler::CrossSiteResourceHandler( 93 CrossSiteResourceHandler::CrossSiteResourceHandler(
80 scoped_ptr<ResourceHandler> next_handler, 94 scoped_ptr<ResourceHandler> next_handler,
81 net::URLRequest* request) 95 net::URLRequest* request)
82 : LayeredResourceHandler(request, next_handler.Pass()), 96 : LayeredResourceHandler(request, next_handler.Pass()),
83 has_started_response_(false), 97 has_started_response_(false),
84 in_cross_site_transition_(false), 98 in_cross_site_transition_(false),
85 completed_during_transition_(false), 99 completed_during_transition_(false),
86 did_defer_(false), 100 did_defer_(false) {
87 completed_status_() {
88 } 101 }
89 102
90 CrossSiteResourceHandler::~CrossSiteResourceHandler() { 103 CrossSiteResourceHandler::~CrossSiteResourceHandler() {
91 // Cleanup back-pointer stored on the request info. 104 // Cleanup back-pointer stored on the request info.
92 GetRequestInfo()->set_cross_site_handler(NULL); 105 GetRequestInfo()->set_cross_site_handler(NULL);
93 } 106 }
94 107
95 bool CrossSiteResourceHandler::OnRequestRedirected( 108 bool CrossSiteResourceHandler::OnRequestRedirected(
96 int request_id, 109 int request_id,
97 const GURL& new_url, 110 const GURL& new_url,
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 bool defer = false; 265 bool defer = false;
253 next_handler_->OnResponseCompleted(info->GetRequestID(), 266 next_handler_->OnResponseCompleted(info->GetRequestID(),
254 completed_status_, 267 completed_status_,
255 completed_security_info_, 268 completed_security_info_,
256 &defer); 269 &defer);
257 if (!defer) 270 if (!defer)
258 ResumeIfDeferred(); 271 ResumeIfDeferred();
259 } 272 }
260 } 273 }
261 274
275 // static
276 void CrossSiteResourceHandler::SetLeakRequestsForTesting(
277 bool leak_requests_for_testing) {
278 leak_requests_for_testing_ = leak_requests_for_testing;
279 }
280
262 // Prepare to render the cross-site response in a new RenderViewHost, by 281 // Prepare to render the cross-site response in a new RenderViewHost, by
263 // telling the old RenderViewHost to run its onunload handler. 282 // telling the old RenderViewHost to run its onunload handler.
264 void CrossSiteResourceHandler::StartCrossSiteTransition( 283 void CrossSiteResourceHandler::StartCrossSiteTransition(
265 int request_id, 284 int request_id,
266 ResourceResponse* response, 285 ResourceResponse* response,
267 bool should_transfer) { 286 bool should_transfer) {
268 in_cross_site_transition_ = true; 287 in_cross_site_transition_ = true;
269 response_ = response; 288 response_ = response;
270 289
271 // Store this handler on the ExtraRequestInfo, so that RDH can call our 290 // Store this handler on the ExtraRequestInfo, so that RDH can call our
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 } 329 }
311 330
312 void CrossSiteResourceHandler::ResumeIfDeferred() { 331 void CrossSiteResourceHandler::ResumeIfDeferred() {
313 if (did_defer_) { 332 if (did_defer_) {
314 did_defer_ = false; 333 did_defer_ = false;
315 controller()->Resume(); 334 controller()->Resume();
316 } 335 }
317 } 336 }
318 337
319 } // namespace content 338 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/cross_site_resource_handler.h ('k') | content/browser/loader/resource_dispatcher_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698