| 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 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1480 // The sites differ. If either one requires a dedicated process, | 1480 // The sites differ. If either one requires a dedicated process, |
| 1481 // then a transfer is needed. | 1481 // then a transfer is needed. |
| 1482 if (rfh->GetSiteInstance()->RequiresDedicatedProcess() || | 1482 if (rfh->GetSiteInstance()->RequiresDedicatedProcess() || |
| 1483 SiteInstanceImpl::DoesSiteRequireDedicatedProcess(context, | 1483 SiteInstanceImpl::DoesSiteRequireDedicatedProcess(context, |
| 1484 dest_url)) { | 1484 dest_url)) { |
| 1485 return true; | 1485 return true; |
| 1486 } | 1486 } |
| 1487 | 1487 |
| 1488 if (SiteIsolationPolicy::IsTopDocumentIsolationEnabled() && | 1488 if (SiteIsolationPolicy::IsTopDocumentIsolationEnabled() && |
| 1489 (!frame_tree_node_->IsMainFrame() || | 1489 (!frame_tree_node_->IsMainFrame() || |
| 1490 rfh->GetSiteInstance()->is_default_subframe_site_instance())) { | 1490 rfh->GetSiteInstance()->IsDefaultSubframeSiteInstance())) { |
| 1491 // Always attempt a transfer in these cases. | 1491 // Always attempt a transfer in these cases. |
| 1492 return true; | 1492 return true; |
| 1493 } | 1493 } |
| 1494 | 1494 |
| 1495 return false; | 1495 return false; |
| 1496 } | 1496 } |
| 1497 | 1497 |
| 1498 scoped_refptr<SiteInstance> RenderFrameHostManager::ConvertToSiteInstance( | 1498 scoped_refptr<SiteInstance> RenderFrameHostManager::ConvertToSiteInstance( |
| 1499 const SiteInstanceDescriptor& descriptor, | 1499 const SiteInstanceDescriptor& descriptor, |
| 1500 SiteInstance* candidate_instance) { | 1500 SiteInstance* candidate_instance) { |
| (...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2717 resolved_url)) { | 2717 resolved_url)) { |
| 2718 DCHECK(!dest_instance || | 2718 DCHECK(!dest_instance || |
| 2719 dest_instance == render_frame_host_->GetSiteInstance()); | 2719 dest_instance == render_frame_host_->GetSiteInstance()); |
| 2720 return false; | 2720 return false; |
| 2721 } | 2721 } |
| 2722 | 2722 |
| 2723 return true; | 2723 return true; |
| 2724 } | 2724 } |
| 2725 | 2725 |
| 2726 } // namespace content | 2726 } // namespace content |
| OLD | NEW |