content/browser/frame_host/render_frame_host_manager.h - Issue 1352813006: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost.

Unified Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 1352813006: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed InitializeWebUI Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/render_frame_host_impl.cc ('K') | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | content/browser/frame_host/render_frame_host_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_manager.h

diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h

index 826718fe2e1d4f4a3ad6601bdd741a38ed2bad31..037c5d0356ae5559c1b3a8599468c7280fd269c9 100644

--- a/content/browser/frame_host/render_frame_host_manager.h

+++ b/content/browser/frame_host/render_frame_host_manager.h

@@ -12,6 +12,7 @@

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

+#include "content/browser/frame_host/render_frame_host_impl.h"

#include "content/browser/renderer_host/render_view_host_delegate.h"

#include "content/browser/site_instance_impl.h"

#include "content/common/content_export.h"

@@ -33,9 +34,7 @@ class NavigationEntryImpl;

class NavigationHandleImpl;

class NavigationRequest;

class NavigatorTestWithBrowserSideNavigation;

-class RenderFrameHost;

class RenderFrameHostDelegate;

-class RenderFrameHostImpl;

class RenderFrameHostManagerTest;

class RenderFrameProxyHost;

class RenderViewHost;

@@ -148,12 +147,6 @@ class CONTENT_EXPORT RenderFrameHostManager {

virtual NavigationControllerImpl&

GetControllerForRenderManager() = 0;

- // Creates a WebUI object for the given URL if one applies. Ownership of the

- // returned pointer will be passed to the caller. If no WebUI applies,

- // returns NULL.

- virtual scoped_ptr<WebUIImpl> CreateWebUIForRenderManager(

- const GURL& url) = 0;

// Returns the navigation entry of the current navigation, or NULL if there

// is none.

virtual NavigationEntry*

@@ -261,19 +254,21 @@ class CONTENT_EXPORT RenderFrameHostManager {

RenderViewHostImpl* pending_render_view_host() const;

// Returns the current committed Web UI or NULL if none applies.

- WebUIImpl* web_ui() const { return web_ui_.get(); }

+ WebUIImpl* web_ui() const { return render_frame_host_->web_ui(); }

// Returns the Web UI for the pending navigation, or NULL of none applies.

WebUIImpl* pending_web_ui() const {

- return pending_web_ui_.get() ? pending_web_ui_.get() :

- pending_and_current_web_ui_.get();

+ return pending_render_frame_host_ ? pending_render_frame_host_->web_ui()

+ : render_frame_host_->pending_web_ui();

}

// PlzNavigate

// Returns the speculative WebUI for the navigation (a newly created one or

// the current one if it should be reused). If none is set returns nullptr.

WebUIImpl* speculative_web_ui() const {

- return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get();

+ return speculative_render_frame_host_

+ ? speculative_render_frame_host_->web_ui()

nasko 2015/10/01 20:05:16 Speculative RFH will never have a pending_web_ui?

carlosk 2015/10/05 16:59:58 Never, ever! I added a section to the design doc

nasko 2015/10/07 23:49:33 Are we enforcing this with a CHECK somehow?

carlosk 2015/10/09 17:29:10 There were some but I added a few more.

+ : render_frame_host_->pending_web_ui();

}

// Called when we want to instruct the renderer to navigate to the given

@@ -336,19 +331,12 @@ class CONTENT_EXPORT RenderFrameHostManager {

void DidChangeOpener(int opener_routing_id,

SiteInstance* source_site_instance);

- // Sets the pending Web UI for the pending navigation, ensuring that the

- // bindings are appropriate compared to |bindings|.

- void SetPendingWebUI(const GURL& url, int bindings);

- // Creates and initializes a RenderFrameHost. The |web_ui| is an optional

- // input parameter used to double check bindings when swapping back in a

- // previously existing RenderFrameHost. If |flags| has the

+ // Creates and initializes a RenderFrameHost. If |flags| has the

// CREATE_RF_SWAPPED_OUT bit set from the CreateRenderFrameFlags enum, it will

// initially be placed on the swapped out hosts list. If |view_routing_id_ptr|

// is not nullptr it will be set to the routing id of the view associated with

// the frame.

scoped_ptr<RenderFrameHostImpl> CreateRenderFrame(SiteInstance* instance,

- WebUIImpl* web_ui,

int flags,

int* view_routing_id_ptr);

@@ -551,16 +539,6 @@ class CONTENT_EXPORT RenderFrameHostManager {

const GURL& new_effective_url,

bool new_is_view_source_mode) const;

- // Creates a new Web UI, ensuring that the bindings are appropriate compared

- // to |bindings|.

- scoped_ptr<WebUIImpl> CreateWebUI(const GURL& url, int bindings);

- // Returns true if it is safe to reuse the current WebUI when navigating from

- // |current_entry| to |new_url|.

- bool ShouldReuseWebUI(

- const NavigationEntry* current_entry,

- const GURL& new_url) const;

// Returns the SiteInstance to use for the navigation.

SiteInstance* GetSiteInstanceForNavigation(const GURL& dest_url,

SiteInstance* source_instance,

@@ -606,11 +584,22 @@ class CONTENT_EXPORT RenderFrameHostManager {

SiteInstance* current_instance,

NavigationEntry* current_entry);

+ // This is the private version of CreateRenderFrame that also allows the

+ // caller to specify a URL and bindings for the potential setup of a WebUI.

+ scoped_ptr<RenderFrameHostImpl> CreateRenderFrameInternal(

+ SiteInstance* instance,

+ const GURL& url,

+ int bindings,

+ int flags,

+ int* view_routing_id_ptr);

// Creates a new RenderFrameHostImpl for the |new_instance| and assign it to

// |pending_render_frame_host_| while respecting the opener route if needed

// and stores it in pending_render_frame_host_.

void CreatePendingRenderFrameHost(SiteInstance* old_instance,

- SiteInstance* new_instance);

+ SiteInstance* new_instance,

+ const GURL& url,

+ int bindings);

// Ensure that we have created all needed proxies for a new RFH with

// SiteInstance |new_instance|: (1) create swapped-out RVHs and proxies for

@@ -644,12 +633,14 @@ class CONTENT_EXPORT RenderFrameHostManager {

int32 view_routing_id,

int32 frame_routing_id,

int32 widget_routing_id,

- int flags);

+ int flags,

+ const GURL& dest_url,

+ int past_bindings);

// PlzNavigate

- // Creates and initializes a speculative RenderFrameHost and/or WebUI for an

- // ongoing navigation. They might be destroyed and re-created later if the

- // navigation is redirected to a different SiteInstance.

+ // Creates and initializes a speculative RenderFrameHost for an ongoing

+ // navigation. They might be destroyed and re-created later if the navigation

+ // is redirected to a different SiteInstance.

bool CreateSpeculativeRenderFrameHost(const GURL& url,

SiteInstance* old_instance,

SiteInstance* new_instance,

@@ -661,15 +652,16 @@ class CONTENT_EXPORT RenderFrameHostManager {

// out state. Returns early if the RenderViewHost has already been

// initialized for another RenderFrameHost.

bool InitRenderView(RenderViewHostImpl* render_view_host,

- int proxy_routing_id);

+ int proxy_routing_id,

+ WebUIImpl* dest_web_ui);

// Initialization for RenderFrameHost uses the same sequence as InitRenderView

// above.

bool InitRenderFrame(RenderFrameHostImpl* render_frame_host);

- // Sets the pending RenderFrameHost/WebUI to be the active one. Note that this

- // doesn't require the pending render_frame_host_ pointer to be non-NULL,

- // since there could be Web UI switching as well. Call this for every commit.

+ // Sets the pending RenderFrameHost to be the active one. Note that if the

+ // current one is being reused this method might switch its WebUI if there is

+ // a pending one. Call this for every commit.

// If PlzNavigate is enabled the method will set the speculative (not pending)

// RenderFrameHost to be the active one.

void CommitPending();

@@ -741,25 +733,15 @@ class CONTENT_EXPORT RenderFrameHostManager {

RenderViewHostDelegate* render_view_delegate_;

RenderWidgetHostDelegate* render_widget_delegate_;

- // Our RenderFrameHost and its associated Web UI (if any, will be NULL for

- // non-WebUI pages). This object is responsible for all communication with

- // a child RenderFrame instance.

+ // Our RenderFrameHost which is responsible for all communication with a child

+ // RenderFrame instance.

// For now, RenderFrameHost keeps a RenderViewHost in its SiteInstance alive.

// Eventually, RenderViewHost will be replaced with a page context.

scoped_ptr<RenderFrameHostImpl> render_frame_host_;

- scoped_ptr<WebUIImpl> web_ui_;

// A RenderFrameHost used to load a cross-site page. This remains hidden

- // while a cross-site request is pending until it calls DidNavigate. It may

- // have an associated Web UI, in which case the Web UI pointer will be non-

- // NULL.

- //

- // The |pending_web_ui_| may be non-NULL even when the

- // |pending_render_frame_host_| is NULL. This will happen when we're

- // transitioning between two Web UI pages: the RFH won't be swapped, so the

- // pending pointer will be unused, but there will be a pending Web UI

- // associated with the navigation.

- // Note: This is not used in PlzNavigate.

+ // while a cross-site request is pending until it calls DidNavigate.

+ // Note: This member is not used in PlzNavigate.

scoped_ptr<RenderFrameHostImpl> pending_render_frame_host_;

// If a pending request needs to be transferred to another process, this

@@ -775,14 +757,6 @@ class CONTENT_EXPORT RenderFrameHostManager {

// navigations in PlzNavigate.

scoped_ptr<NavigationHandleImpl> transfer_navigation_handle_;

- // If either of these is non-NULL, the pending navigation is to a chrome:

- // page. The scoped_ptr is used if pending_web_ui_ != web_ui_, the WeakPtr is

- // used for when they reference the same object. If either is non-NULL, the

- // other should be NULL.

- // Note: These are not used in PlzNavigate.

- scoped_ptr<WebUIImpl> pending_web_ui_;

- base::WeakPtr<WebUIImpl> pending_and_current_web_ui_;

class RenderFrameProxyHostMap;

scoped_ptr<RenderFrameProxyHostMap> proxy_hosts_;

@@ -797,21 +771,15 @@ class CONTENT_EXPORT RenderFrameHostManager {

InterstitialPageImpl* interstitial_page_;

// PlzNavigate

- // These members store a speculative RenderFrameHost and WebUI. They are

- // created early in a navigation so a renderer process can be started in

- // parallel, if needed. This is purely a performance optimization and is not

- // required for correct behavior. The created RenderFrameHost might be

- // discarded later on if the final URL's SiteInstance isn't compatible with

- // what was used to create it.

- // Note: PlzNavigate only uses speculative RenderFrameHost and WebUI, not

- // the pending ones.

+ // Stores a speculative RenderFrameHost which is created early in a navigation

+ // so a renderer process can be started in parallel, if needed.

+ // This is purely a performance optimization and is not required for correct

+ // behavior. The speculative RenderFrameHost might be discarded later on if

+ // the final URL's SiteInstance isn't compatible with the one used to create

+ // it.

+ // Note: PlzNavigate only uses the speculative RenderFrameHost, not the

+ // pending one.

scoped_ptr<RenderFrameHostImpl> speculative_render_frame_host_;

- scoped_ptr<WebUIImpl> speculative_web_ui_;

- // PlzNavigate

- // If true at navigation commit time the current WebUI will be kept instead of

- // creating a new one.

- bool should_reuse_web_ui_;

base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;