Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

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

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: Revert unused changes from previous attempt + more cleanup. Created 5 years, 10 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
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 15338be2d0de70f6d680a0daf3b0359aa460b58d..d861bd276eb1afa2f603cbbee8a2321eef9dfc7b 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -216,6 +216,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 {
@@ -241,6 +242,10 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get();
}
+ void set_pseudo_parent_frame_tree_node_id(int64 parent_frame_tree_node_id) {
+ pseudo_parent_frame_tree_node_id_ = parent_frame_tree_node_id;
+ }
+
// Called when we want to instruct the renderer to navigate to the given
// navigation entry. It may create a new RenderFrameHost or re-use an existing
// one. The RenderFrameHost to navigate will be returned. Returns NULL if one
@@ -616,6 +621,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
RenderViewHostDelegate* render_view_delegate_;
RenderWidgetHostDelegate* render_widget_delegate_;
+ int64 pseudo_parent_frame_tree_node_id_;
Charlie Reis 2015/03/10 04:09:44 Pseudo is not very descriptive. Do you mean embed
+
// 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.

Powered by Google App Engine
This is Rietveld 408576698