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 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1727 | 1727 |
1728 RenderViewHostImpl* render_view_host = nullptr; | 1728 RenderViewHostImpl* render_view_host = nullptr; |
1729 | 1729 |
1730 // Ensure a RenderViewHost exists for |instance|, as it creates the page | 1730 // Ensure a RenderViewHost exists for |instance|, as it creates the page |
1731 // level structure in Blink. | 1731 // level structure in Blink. |
1732 render_view_host = | 1732 render_view_host = |
1733 frame_tree_node_->frame_tree()->GetRenderViewHost(instance); | 1733 frame_tree_node_->frame_tree()->GetRenderViewHost(instance); |
1734 if (!render_view_host) { | 1734 if (!render_view_host) { |
1735 CHECK(frame_tree_node_->IsMainFrame()); | 1735 CHECK(frame_tree_node_->IsMainFrame()); |
1736 render_view_host = frame_tree_node_->frame_tree()->CreateRenderViewHost( | 1736 render_view_host = frame_tree_node_->frame_tree()->CreateRenderViewHost( |
1737 instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, true, true); | 1737 instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, true, |
| 1738 delegate_->IsHidden()); |
1738 } | 1739 } |
1739 | 1740 |
1740 RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance); | 1741 RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance); |
1741 if (proxy && proxy->is_render_frame_proxy_live()) | 1742 if (proxy && proxy->is_render_frame_proxy_live()) |
1742 return proxy->GetRoutingID(); | 1743 return proxy->GetRoutingID(); |
1743 | 1744 |
1744 if (!proxy) | 1745 if (!proxy) |
1745 proxy = CreateRenderFrameProxyHost(instance, render_view_host); | 1746 proxy = CreateRenderFrameProxyHost(instance, render_view_host); |
1746 | 1747 |
1747 if (frame_tree_node_->IsMainFrame()) { | 1748 if (frame_tree_node_->IsMainFrame()) { |
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2591 resolved_url)) { | 2592 resolved_url)) { |
2592 DCHECK(!dest_instance || | 2593 DCHECK(!dest_instance || |
2593 dest_instance == render_frame_host_->GetSiteInstance()); | 2594 dest_instance == render_frame_host_->GetSiteInstance()); |
2594 return false; | 2595 return false; |
2595 } | 2596 } |
2596 | 2597 |
2597 return true; | 2598 return true; |
2598 } | 2599 } |
2599 | 2600 |
2600 } // namespace content | 2601 } // namespace content |
OLD | NEW |