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 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 new FrameMsg_DidStartLoading(pair.second->GetRoutingID())); | 933 new FrameMsg_DidStartLoading(pair.second->GetRoutingID())); |
934 } | 934 } |
935 } | 935 } |
936 | 936 |
937 void RenderFrameHostManager::OnDidStopLoading() { | 937 void RenderFrameHostManager::OnDidStopLoading() { |
938 for (const auto& pair : proxy_hosts_) { | 938 for (const auto& pair : proxy_hosts_) { |
939 pair.second->Send(new FrameMsg_DidStopLoading(pair.second->GetRoutingID())); | 939 pair.second->Send(new FrameMsg_DidStopLoading(pair.second->GetRoutingID())); |
940 } | 940 } |
941 } | 941 } |
942 | 942 |
943 void RenderFrameHostManager::OnDidUpdateName(const std::string& name) { | 943 void RenderFrameHostManager::OnDidUpdateName(const std::string& name, |
| 944 const std::string& unique_name) { |
944 // The window.name message may be sent outside of --site-per-process when | 945 // The window.name message may be sent outside of --site-per-process when |
945 // report_frame_name_changes renderer preference is set (used by | 946 // report_frame_name_changes renderer preference is set (used by |
946 // WebView). Don't send the update to proxies in those cases. | 947 // WebView). Don't send the update to proxies in those cases. |
947 // TODO(nick,nasko): Should this be IsSwappedOutStateForbidden, to match | 948 // TODO(nick,nasko): Should this be IsSwappedOutStateForbidden, to match |
948 // OnDidUpdateOrigin? | 949 // OnDidUpdateOrigin? |
949 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 950 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
950 return; | 951 return; |
951 | 952 |
952 for (const auto& pair : proxy_hosts_) { | 953 for (const auto& pair : proxy_hosts_) { |
953 pair.second->Send( | 954 pair.second->Send(new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), |
954 new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), name)); | 955 name, unique_name)); |
955 } | 956 } |
956 } | 957 } |
957 | 958 |
958 void RenderFrameHostManager::OnEnforceStrictMixedContentChecking( | 959 void RenderFrameHostManager::OnEnforceStrictMixedContentChecking( |
959 bool should_enforce) { | 960 bool should_enforce) { |
960 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 961 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
961 return; | 962 return; |
962 | 963 |
963 for (const auto& pair : proxy_hosts_) { | 964 for (const auto& pair : proxy_hosts_) { |
964 pair.second->Send(new FrameMsg_EnforceStrictMixedContentChecking( | 965 pair.second->Send(new FrameMsg_EnforceStrictMixedContentChecking( |
(...skipping 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2457 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { | 2458 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { |
2458 if (!frame_tree_node_->opener()) | 2459 if (!frame_tree_node_->opener()) |
2459 return MSG_ROUTING_NONE; | 2460 return MSG_ROUTING_NONE; |
2460 | 2461 |
2461 return frame_tree_node_->opener() | 2462 return frame_tree_node_->opener() |
2462 ->render_manager() | 2463 ->render_manager() |
2463 ->GetRoutingIdForSiteInstance(instance); | 2464 ->GetRoutingIdForSiteInstance(instance); |
2464 } | 2465 } |
2465 | 2466 |
2466 } // namespace content | 2467 } // namespace content |
OLD | NEW |