| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 } | 665 } |
| 666 | 666 |
| 667 void RenderFrameHostManager::DidNavigateFrame( | 667 void RenderFrameHostManager::DidNavigateFrame( |
| 668 RenderFrameHostImpl* render_frame_host, | 668 RenderFrameHostImpl* render_frame_host, |
| 669 bool was_caused_by_user_gesture) { | 669 bool was_caused_by_user_gesture) { |
| 670 CommitPendingIfNecessary(render_frame_host, was_caused_by_user_gesture); | 670 CommitPendingIfNecessary(render_frame_host, was_caused_by_user_gesture); |
| 671 | 671 |
| 672 // Make sure any dynamic changes to this frame's sandbox flags that were made | 672 // Make sure any dynamic changes to this frame's sandbox flags that were made |
| 673 // prior to navigation take effect. | 673 // prior to navigation take effect. |
| 674 CommitPendingSandboxFlags(); | 674 CommitPendingSandboxFlags(); |
| 675 |
| 676 // Reset enforcement of strict mixed content checking. |
| 677 frame_tree_node_->SetShouldEnforceStrictMixedContentChecking(false); |
| 675 } | 678 } |
| 676 | 679 |
| 677 void RenderFrameHostManager::CommitPendingIfNecessary( | 680 void RenderFrameHostManager::CommitPendingIfNecessary( |
| 678 RenderFrameHostImpl* render_frame_host, | 681 RenderFrameHostImpl* render_frame_host, |
| 679 bool was_caused_by_user_gesture) { | 682 bool was_caused_by_user_gesture) { |
| 680 if (!pending_render_frame_host_ && !speculative_render_frame_host_) { | 683 if (!pending_render_frame_host_ && !speculative_render_frame_host_) { |
| 681 DCHECK(!should_reuse_web_ui_ || web_ui_); | 684 DCHECK(!should_reuse_web_ui_ || web_ui_); |
| 682 | 685 |
| 683 // We should only hear this from our current renderer. | 686 // We should only hear this from our current renderer. |
| 684 DCHECK_EQ(render_frame_host_.get(), render_frame_host); | 687 DCHECK_EQ(render_frame_host_.get(), render_frame_host); |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1142 // OnDidUpdateOrigin? | 1145 // OnDidUpdateOrigin? |
| 1143 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 1146 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
| 1144 return; | 1147 return; |
| 1145 | 1148 |
| 1146 for (const auto& pair : *proxy_hosts_) { | 1149 for (const auto& pair : *proxy_hosts_) { |
| 1147 pair.second->Send( | 1150 pair.second->Send( |
| 1148 new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), name)); | 1151 new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), name)); |
| 1149 } | 1152 } |
| 1150 } | 1153 } |
| 1151 | 1154 |
| 1155 void RenderFrameHostManager::OnDidUpdateShouldEnforceStrictMixedContentChecking( |
| 1156 bool should_enforce) { |
| 1157 for (const auto& pair : *proxy_hosts_) { |
| 1158 pair.second->Send( |
| 1159 new FrameMsg_DidUpdateShouldEnforceStrictMixedContentChecking( |
| 1160 pair.second->GetRoutingID(), should_enforce)); |
| 1161 } |
| 1162 } |
| 1163 |
| 1152 void RenderFrameHostManager::OnDidUpdateOrigin(const url::Origin& origin) { | 1164 void RenderFrameHostManager::OnDidUpdateOrigin(const url::Origin& origin) { |
| 1153 if (!SiteIsolationPolicy::IsSwappedOutStateForbidden()) | 1165 if (!SiteIsolationPolicy::IsSwappedOutStateForbidden()) |
| 1154 return; | 1166 return; |
| 1155 | 1167 |
| 1156 for (const auto& pair : *proxy_hosts_) { | 1168 for (const auto& pair : *proxy_hosts_) { |
| 1157 pair.second->Send( | 1169 pair.second->Send( |
| 1158 new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin)); | 1170 new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin)); |
| 1159 } | 1171 } |
| 1160 } | 1172 } |
| 1161 | 1173 |
| (...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2684 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { | 2696 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { |
| 2685 if (!frame_tree_node_->opener()) | 2697 if (!frame_tree_node_->opener()) |
| 2686 return MSG_ROUTING_NONE; | 2698 return MSG_ROUTING_NONE; |
| 2687 | 2699 |
| 2688 return frame_tree_node_->opener() | 2700 return frame_tree_node_->opener() |
| 2689 ->render_manager() | 2701 ->render_manager() |
| 2690 ->GetRoutingIdForSiteInstance(instance); | 2702 ->GetRoutingIdForSiteInstance(instance); |
| 2691 } | 2703 } |
| 2692 | 2704 |
| 2693 } // namespace content | 2705 } // namespace content |
| OLD | NEW |