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 f8004d9f901b5238f68cdf25745bcf83bbf1da14..7665c0feb0a9b4d2ca325f90558fca12d69f0d58 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.h |
+++ b/content/browser/frame_host/render_frame_host_manager.h |
@@ -173,6 +173,11 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
// hidden state. |
virtual bool IsHidden() = 0; |
+ // Returns the FTN id of the parent delegate (WebContents) that is hosting |
Charlie Reis
2015/04/30 23:06:46
s/parent/embedder/
lazyboy
2015/05/05 07:28:14
Done for now.
Although it was suggested by nasko t
|
+ // this delegate (WebContents), -1 if this WebContents does not have a |
Charlie Reis
2015/04/30 23:06:46
Period. Then "Returns -1 if"
lazyboy
2015/05/05 07:28:14
Done.
|
+ // parent delegate. |
Charlie Reis
2015/04/30 23:06:46
s/parent/embedder/
lazyboy
2015/05/05 07:28:14
Done.
|
+ virtual int64 GetEmbedderFrameTreeNodeID() = 0; |
+ |
protected: |
virtual ~Delegate() {} |
}; |
@@ -219,6 +224,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
RenderWidgetHostView* GetRenderWidgetHostView() const; |
RenderFrameProxyHost* GetProxyToParent(); |
+ RenderFrameProxyHost* GetProxyToEmbedder(); |
// Returns the pending RenderFrameHost, or NULL if there is no pending one. |
RenderFrameHostImpl* pending_frame_host() const { |
@@ -421,6 +427,19 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
RenderViewHostImpl* render_view_host, |
SiteInstance* instance); |
+ // Creates a proxy for guest frame in embedder's process. |
Charlie Reis
2015/04/30 23:06:46
Called on the guest RFHM to create a proxy for thi
lazyboy
2015/05/05 07:28:13
Done.
|
+ // This proxy is used to swap out the initial guest frame in embedder. |
Charlie Reis
2015/04/30 23:06:46
in the embedder.
lazyboy
2015/05/05 07:28:14
Done.
|
+ void CreateEmbedderProxy(SiteInstance* embedder_site_instance, |
+ int* swapped_out_render_view_routing_id, |
+ int* proxy_routing_id); |
+ |
+ // Replaces initial guest frame in embedder with the proxy that has routing |
Charlie Reis
2015/04/30 23:06:46
Called on the embedder RFHM to replace the initial
lazyboy
2015/05/05 07:28:14
Done.
|
+ // id |proxy_to_embedder_routing_id|. |
+ void ReplaceWithGuestProxy(int proxy_to_embedder_routing_id); |
+ |
+ // Sets the child RWHV for this guest frame. |
+ void UpdateGuestRWHView(RenderWidgetHostView* child_rwhv); |
Charlie Reis
2015/04/30 23:06:46
SetGuestRenderWidgetHostView
lazyboy
2015/05/05 07:28:14
Done.
|
+ |
private: |
friend class FrameTreeVisualizer; |
friend class NavigatorTestWithBrowserSideNavigation; |