OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/render_frame_host_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <utility> | 10 #include <utility> |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 | 479 |
480 // Treat the last URL in the chain as the destination and the remainder as | 480 // Treat the last URL in the chain as the destination and the remainder as |
481 // the redirect chain. | 481 // the redirect chain. |
482 CHECK(transfer_url_chain.size()); | 482 CHECK(transfer_url_chain.size()); |
483 GURL transfer_url = transfer_url_chain.back(); | 483 GURL transfer_url = transfer_url_chain.back(); |
484 std::vector<GURL> rest_of_chain = transfer_url_chain; | 484 std::vector<GURL> rest_of_chain = transfer_url_chain; |
485 rest_of_chain.pop_back(); | 485 rest_of_chain.pop_back(); |
486 | 486 |
487 transferring_render_frame_host->frame_tree_node() | 487 transferring_render_frame_host->frame_tree_node() |
488 ->navigator() | 488 ->navigator() |
489 ->RequestTransferURL(transferring_render_frame_host, transfer_url, | 489 ->RequestTransferURL( |
490 nullptr, rest_of_chain, referrer, page_transition, | 490 transferring_render_frame_host, transfer_url, nullptr, rest_of_chain, |
491 global_request_id, should_replace_current_entry); | 491 referrer, page_transition, global_request_id, |
| 492 should_replace_current_entry, |
| 493 transfer_navigation_handle_->GetMethod(), |
| 494 transfer_navigation_handle_->resource_request_body()); |
492 | 495 |
493 // The transferring request was only needed during the RequestTransferURL | 496 // The transferring request was only needed during the RequestTransferURL |
494 // call, so it is safe to clear at this point. | 497 // call, so it is safe to clear at this point. |
495 cross_site_transferring_request_.reset(); | 498 cross_site_transferring_request_.reset(); |
496 | 499 |
497 // If the navigation continued, the NavigationHandle should have been | 500 // If the navigation continued, the NavigationHandle should have been |
498 // transfered to a RenderFrameHost. In the other cases, it should be cleared. | 501 // transfered to a RenderFrameHost. In the other cases, it should be cleared. |
499 transfer_navigation_handle_.reset(); | 502 transfer_navigation_handle_.reset(); |
500 | 503 |
501 // If the navigation in the new renderer did not start, inform the | 504 // If the navigation in the new renderer did not start, inform the |
(...skipping 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2597 resolved_url)) { | 2600 resolved_url)) { |
2598 DCHECK(!dest_instance || | 2601 DCHECK(!dest_instance || |
2599 dest_instance == render_frame_host_->GetSiteInstance()); | 2602 dest_instance == render_frame_host_->GetSiteInstance()); |
2600 return false; | 2603 return false; |
2601 } | 2604 } |
2602 | 2605 |
2603 return true; | 2606 return true; |
2604 } | 2607 } |
2605 | 2608 |
2606 } // namespace content | 2609 } // namespace content |
OLD | NEW |