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 980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
991 bool should_enforce) { | 991 bool should_enforce) { |
992 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 992 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
993 return; | 993 return; |
994 | 994 |
995 for (const auto& pair : proxy_hosts_) { | 995 for (const auto& pair : proxy_hosts_) { |
996 pair.second->Send(new FrameMsg_EnforceStrictMixedContentChecking( | 996 pair.second->Send(new FrameMsg_EnforceStrictMixedContentChecking( |
997 pair.second->GetRoutingID(), should_enforce)); | 997 pair.second->GetRoutingID(), should_enforce)); |
998 } | 998 } |
999 } | 999 } |
1000 | 1000 |
1001 void RenderFrameHostManager::OnDidUpdateOrigin(const url::Origin& origin) { | 1001 void RenderFrameHostManager::OnDidUpdateOrigin( |
| 1002 const url::Origin& origin, |
| 1003 bool is_potentially_trustworthy_unique_origin) { |
1002 if (!SiteIsolationPolicy::IsSwappedOutStateForbidden()) | 1004 if (!SiteIsolationPolicy::IsSwappedOutStateForbidden()) |
1003 return; | 1005 return; |
1004 | 1006 |
1005 for (const auto& pair : proxy_hosts_) { | 1007 for (const auto& pair : proxy_hosts_) { |
1006 pair.second->Send( | 1008 pair.second->Send( |
1007 new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin)); | 1009 new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin, |
| 1010 is_potentially_trustworthy_unique_origin)); |
1008 } | 1011 } |
1009 } | 1012 } |
1010 | 1013 |
1011 RenderFrameHostManager::SiteInstanceDescriptor::SiteInstanceDescriptor( | 1014 RenderFrameHostManager::SiteInstanceDescriptor::SiteInstanceDescriptor( |
1012 BrowserContext* browser_context, | 1015 BrowserContext* browser_context, |
1013 GURL dest_url, | 1016 GURL dest_url, |
1014 bool related_to_current) | 1017 bool related_to_current) |
1015 : existing_site_instance(nullptr), | 1018 : existing_site_instance(nullptr), |
1016 new_is_related_to_current(related_to_current) { | 1019 new_is_related_to_current(related_to_current) { |
1017 new_site_url = SiteInstance::GetSiteForURL(browser_context, dest_url); | 1020 new_site_url = SiteInstance::GetSiteForURL(browser_context, dest_url); |
(...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2540 } else if (pending_render_frame_host_) { | 2543 } else if (pending_render_frame_host_) { |
2541 send_msg(pending_render_frame_host_.get(), | 2544 send_msg(pending_render_frame_host_.get(), |
2542 pending_render_frame_host_->GetRoutingID(), msg); | 2545 pending_render_frame_host_->GetRoutingID(), msg); |
2543 } | 2546 } |
2544 | 2547 |
2545 msg->set_routing_id(render_frame_host_->GetRoutingID()); | 2548 msg->set_routing_id(render_frame_host_->GetRoutingID()); |
2546 render_frame_host_->Send(msg); | 2549 render_frame_host_->Send(msg); |
2547 } | 2550 } |
2548 | 2551 |
2549 } // namespace content | 2552 } // namespace content |
OLD | NEW |