| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 ResetProxyHosts(); | 247 ResetProxyHosts(); |
| 248 | 248 |
| 249 // Release the WebUI prior to resetting the current RenderFrameHost, as the | 249 // Release the WebUI prior to resetting the current RenderFrameHost, as the |
| 250 // WebUI accesses the RenderFrameHost during cleanup. | 250 // WebUI accesses the RenderFrameHost during cleanup. |
| 251 web_ui_.reset(); | 251 web_ui_.reset(); |
| 252 | 252 |
| 253 // We should always have a current RenderFrameHost except in some tests. | 253 // We should always have a current RenderFrameHost except in some tests. |
| 254 SetRenderFrameHost(scoped_ptr<RenderFrameHostImpl>()); | 254 SetRenderFrameHost(scoped_ptr<RenderFrameHostImpl>()); |
| 255 } | 255 } |
| 256 | 256 |
| 257 void RenderFrameHostManager::Init(BrowserContext* browser_context, | 257 void RenderFrameHostManager::Init(SiteInstance* site_instance, |
| 258 SiteInstance* site_instance, | |
| 259 int32 view_routing_id, | 258 int32 view_routing_id, |
| 260 int32 frame_routing_id, | 259 int32 frame_routing_id, |
| 261 int32 widget_routing_id, | 260 int32 widget_routing_id, |
| 262 int32 surface_id) { | 261 int32 surface_id) { |
| 263 // Create a RenderViewHost and RenderFrameHost, once we have an instance. It | 262 DCHECK(site_instance); |
| 264 // is important to immediately give this SiteInstance to a RenderViewHost so | |
| 265 // that the SiteInstance is ref counted. | |
| 266 if (!site_instance) | |
| 267 site_instance = SiteInstance::Create(browser_context); | |
| 268 | |
| 269 int flags = delegate_->IsHidden() ? CREATE_RF_HIDDEN : 0; | 263 int flags = delegate_->IsHidden() ? CREATE_RF_HIDDEN : 0; |
| 270 SetRenderFrameHost(CreateRenderFrameHost(site_instance, view_routing_id, | 264 SetRenderFrameHost(CreateRenderFrameHost(site_instance, view_routing_id, |
| 271 frame_routing_id, widget_routing_id, | 265 frame_routing_id, widget_routing_id, |
| 272 surface_id, flags)); | 266 surface_id, flags)); |
| 273 | 267 |
| 274 // Notify the delegate of the creation of the current RenderFrameHost. | 268 // Notify the delegate of the creation of the current RenderFrameHost. |
| 275 // Do this only for subframes, as the main frame case is taken care of by | 269 // Do this only for subframes, as the main frame case is taken care of by |
| 276 // WebContentsImpl::Init. | 270 // WebContentsImpl::Init. |
| 277 if (!frame_tree_node_->IsMainFrame()) { | 271 if (!frame_tree_node_->IsMainFrame()) { |
| 278 delegate_->NotifySwappedFromRenderManager( | 272 delegate_->NotifySwappedFromRenderManager( |
| (...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1734 new_render_frame_host->GetProcess()->AddPendingView(); | 1728 new_render_frame_host->GetProcess()->AddPendingView(); |
| 1735 | 1729 |
| 1736 proxy_hosts_->Remove(instance->GetId()); | 1730 proxy_hosts_->Remove(instance->GetId()); |
| 1737 // NB |proxy| is deleted at this point. | 1731 // NB |proxy| is deleted at this point. |
| 1738 } | 1732 } |
| 1739 } else { | 1733 } else { |
| 1740 // Create a new RenderFrameHost if we don't find an existing one. | 1734 // Create a new RenderFrameHost if we don't find an existing one. |
| 1741 | 1735 |
| 1742 int32 widget_routing_id = MSG_ROUTING_NONE; | 1736 int32 widget_routing_id = MSG_ROUTING_NONE; |
| 1743 int32 surface_id = 0; | 1737 int32 surface_id = 0; |
| 1744 // A RenderFrame in a different process from its parent RenderFrame | 1738 // A main RenderFrame, or a RenderFrame in a different process from its |
| 1745 // requires a RenderWidget for input/layout/painting. | 1739 // parent RenderFrame requires a RenderWidget for input/layout/painting. |
| 1746 if (frame_tree_node_->parent() && | 1740 if (!frame_tree_node_->parent() || |
| 1747 frame_tree_node_->parent()->current_frame_host()->GetSiteInstance() != | 1741 frame_tree_node_->parent()->current_frame_host()->GetSiteInstance() != |
| 1748 instance) { | 1742 instance) { |
| 1749 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible()); | 1743 CHECK(!frame_tree_node_->parent() || |
| 1744 SiteIsolationPolicy::AreCrossProcessFramesPossible()); |
| 1750 widget_routing_id = instance->GetProcess()->GetNextRoutingID(); | 1745 widget_routing_id = instance->GetProcess()->GetNextRoutingID(); |
| 1751 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer( | 1746 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer( |
| 1752 instance->GetProcess()->GetID(), widget_routing_id); | 1747 instance->GetProcess()->GetID(), widget_routing_id); |
| 1753 } | 1748 } |
| 1754 | 1749 |
| 1755 new_render_frame_host = | 1750 new_render_frame_host = |
| 1756 CreateRenderFrameHost(instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, | 1751 CreateRenderFrameHost(instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
| 1757 widget_routing_id, surface_id, flags); | 1752 widget_routing_id, surface_id, flags); |
| 1758 RenderViewHostImpl* render_view_host = | 1753 RenderViewHostImpl* render_view_host = |
| 1759 new_render_frame_host->render_view_host(); | 1754 new_render_frame_host->render_view_host(); |
| (...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2575 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { | 2570 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { |
| 2576 if (!frame_tree_node_->opener()) | 2571 if (!frame_tree_node_->opener()) |
| 2577 return MSG_ROUTING_NONE; | 2572 return MSG_ROUTING_NONE; |
| 2578 | 2573 |
| 2579 return frame_tree_node_->opener() | 2574 return frame_tree_node_->opener() |
| 2580 ->render_manager() | 2575 ->render_manager() |
| 2581 ->GetRoutingIdForSiteInstance(instance); | 2576 ->GetRoutingIdForSiteInstance(instance); |
| 2582 } | 2577 } |
| 2583 | 2578 |
| 2584 } // namespace content | 2579 } // namespace content |
| OLD | NEW |