| 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 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1758 | 1758 |
| 1759 RenderViewHostImpl* render_view_host = nullptr; | 1759 RenderViewHostImpl* render_view_host = nullptr; |
| 1760 | 1760 |
| 1761 // Ensure a RenderViewHost exists for |instance|, as it creates the page | 1761 // Ensure a RenderViewHost exists for |instance|, as it creates the page |
| 1762 // level structure in Blink. | 1762 // level structure in Blink. |
| 1763 render_view_host = | 1763 render_view_host = |
| 1764 frame_tree_node_->frame_tree()->GetRenderViewHost(instance); | 1764 frame_tree_node_->frame_tree()->GetRenderViewHost(instance); |
| 1765 if (!render_view_host) { | 1765 if (!render_view_host) { |
| 1766 CHECK(frame_tree_node_->IsMainFrame()); | 1766 CHECK(frame_tree_node_->IsMainFrame()); |
| 1767 render_view_host = frame_tree_node_->frame_tree()->CreateRenderViewHost( | 1767 render_view_host = frame_tree_node_->frame_tree()->CreateRenderViewHost( |
| 1768 instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, true, true); | 1768 instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, true, |
| 1769 delegate_->IsHidden()); |
| 1769 } | 1770 } |
| 1770 | 1771 |
| 1771 RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance); | 1772 RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance); |
| 1772 if (proxy && proxy->is_render_frame_proxy_live()) | 1773 if (proxy && proxy->is_render_frame_proxy_live()) |
| 1773 return proxy->GetRoutingID(); | 1774 return proxy->GetRoutingID(); |
| 1774 | 1775 |
| 1775 if (!proxy) | 1776 if (!proxy) |
| 1776 proxy = CreateRenderFrameProxyHost(instance, render_view_host); | 1777 proxy = CreateRenderFrameProxyHost(instance, render_view_host); |
| 1777 | 1778 |
| 1778 if (frame_tree_node_->IsMainFrame()) { | 1779 if (frame_tree_node_->IsMainFrame()) { |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2599 resolved_url)) { | 2600 resolved_url)) { |
| 2600 DCHECK(!dest_instance || | 2601 DCHECK(!dest_instance || |
| 2601 dest_instance == render_frame_host_->GetSiteInstance()); | 2602 dest_instance == render_frame_host_->GetSiteInstance()); |
| 2602 return false; | 2603 return false; |
| 2603 } | 2604 } |
| 2604 | 2605 |
| 2605 return true; | 2606 return true; |
| 2606 } | 2607 } |
| 2607 | 2608 |
| 2608 } // namespace content | 2609 } // namespace content |
| OLD | NEW |