| 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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 // DidNavigateFrame(), because the origin needs to be included in the SwapOut | 516 // DidNavigateFrame(), because the origin needs to be included in the SwapOut |
| 517 // message, which is sent inside DidNavigateFrame(). SwapOut needs the | 517 // message, which is sent inside DidNavigateFrame(). SwapOut needs the |
| 518 // origin because it creates a RenderFrameProxy that needs this to initialize | 518 // origin because it creates a RenderFrameProxy that needs this to initialize |
| 519 // its security context. This origin will also be sent to RenderFrameProxies | 519 // its security context. This origin will also be sent to RenderFrameProxies |
| 520 // created via ViewMsg_New and FrameMsg_NewFrameProxy. | 520 // created via ViewMsg_New and FrameMsg_NewFrameProxy. |
| 521 render_frame_host->frame_tree_node()->SetCurrentOrigin(params.origin); | 521 render_frame_host->frame_tree_node()->SetCurrentOrigin(params.origin); |
| 522 | 522 |
| 523 render_frame_host->frame_tree_node()->SetEnforceStrictMixedContentChecking( | 523 render_frame_host->frame_tree_node()->SetEnforceStrictMixedContentChecking( |
| 524 params.should_enforce_strict_mixed_content_checking); | 524 params.should_enforce_strict_mixed_content_checking); |
| 525 | 525 |
| 526 render_frame_host->frame_tree_node()->SetUniqueOriginPotentiallyTrustworthy( |
| 527 params.is_potentially_trustworthy_unique_origin); |
| 528 |
| 526 // When using --site-per-process, we notify the RFHM for all navigations, | 529 // When using --site-per-process, we notify the RFHM for all navigations, |
| 527 // not just main frame navigations. | 530 // not just main frame navigations. |
| 528 if (oopifs_possible) { | 531 if (oopifs_possible) { |
| 529 FrameTreeNode* frame = render_frame_host->frame_tree_node(); | 532 FrameTreeNode* frame = render_frame_host->frame_tree_node(); |
| 530 frame->render_manager()->DidNavigateFrame( | 533 frame->render_manager()->DidNavigateFrame( |
| 531 render_frame_host, params.gesture == NavigationGestureUser); | 534 render_frame_host, params.gesture == NavigationGestureUser); |
| 532 } | 535 } |
| 533 | 536 |
| 534 // Update the site of the SiteInstance if it doesn't have one yet, unless | 537 // Update the site of the SiteInstance if it doesn't have one yet, unless |
| 535 // assigning a site is not necessary for this URL. In that case, the | 538 // assigning a site is not necessary for this URL. In that case, the |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1115 entry->set_should_replace_entry(pending_entry->should_replace_entry()); | 1118 entry->set_should_replace_entry(pending_entry->should_replace_entry()); |
| 1116 entry->SetRedirectChain(pending_entry->GetRedirectChain()); | 1119 entry->SetRedirectChain(pending_entry->GetRedirectChain()); |
| 1117 } | 1120 } |
| 1118 controller_->SetPendingEntry(std::move(entry)); | 1121 controller_->SetPendingEntry(std::move(entry)); |
| 1119 if (delegate_) | 1122 if (delegate_) |
| 1120 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1123 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
| 1121 } | 1124 } |
| 1122 } | 1125 } |
| 1123 | 1126 |
| 1124 } // namespace content | 1127 } // namespace content |
| OLD | NEW |