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

Side by Side Diff: content/browser/frame_host/render_frame_proxy_host.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, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/frame_host/render_frame_host_impl.h" 9 #include "content/browser/frame_host/render_frame_host_impl.h"
10 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 ~RenderFrameProxyHost() override; 62 ~RenderFrameProxyHost() override;
63 63
64 RenderProcessHost* GetProcess() { 64 RenderProcessHost* GetProcess() {
65 return process_; 65 return process_;
66 } 66 }
67 67
68 // Initializes the object and creates the RenderFrameProxy in the process 68 // Initializes the object and creates the RenderFrameProxy in the process
69 // for the SiteInstance. 69 // for the SiteInstance.
70 bool InitRenderFrameProxy(); 70 bool InitRenderFrameProxy();
71 71
72 void SetOverriddenParentFTNID(
73 int64 pseudo_parent_frame_tree_node_id);
74
72 int GetRoutingID() { 75 int GetRoutingID() {
73 return routing_id_; 76 return routing_id_;
74 } 77 }
75 78
76 SiteInstance* GetSiteInstance() { 79 SiteInstance* GetSiteInstance() {
77 return site_instance_.get(); 80 return site_instance_.get();
78 } 81 }
79 82
80 FrameTreeNode* frame_tree_node() const { return frame_tree_node_; }; 83 FrameTreeNode* frame_tree_node() const { return frame_tree_node_; };
81 84
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // method has the side effect of creating the process if it doesn't exist. 131 // method has the side effect of creating the process if it doesn't exist.
129 // Cache a pointer to avoid unnecessary process creation. 132 // Cache a pointer to avoid unnecessary process creation.
130 RenderProcessHost* process_; 133 RenderProcessHost* process_;
131 134
132 // The node in the frame tree where this proxy is located. 135 // The node in the frame tree where this proxy is located.
133 FrameTreeNode* frame_tree_node_; 136 FrameTreeNode* frame_tree_node_;
134 137
135 // True if we have a live RenderFrameProxy for this host. 138 // True if we have a live RenderFrameProxy for this host.
136 bool render_frame_proxy_created_; 139 bool render_frame_proxy_created_;
137 140
141 int64 pseudo_parent_frame_tree_node_id_;
142
138 // When a RenderFrameHost is in a different process from its parent in the 143 // When a RenderFrameHost is in a different process from its parent in the
139 // frame tree, this class connects its associated RenderWidgetHostView 144 // frame tree, this class connects its associated RenderWidgetHostView
140 // to this RenderFrameProxyHost, which corresponds to the same frame in the 145 // to this RenderFrameProxyHost, which corresponds to the same frame in the
141 // parent's renderer process. 146 // parent's renderer process.
142 scoped_ptr<CrossProcessFrameConnector> cross_process_frame_connector_; 147 scoped_ptr<CrossProcessFrameConnector> cross_process_frame_connector_;
143 148
144 // TODO(nasko): This can be removed once we don't have a swapped out state on 149 // TODO(nasko): This can be removed once we don't have a swapped out state on
145 // RenderFrameHosts. See https://crbug.com/357747. 150 // RenderFrameHosts. See https://crbug.com/357747.
146 scoped_ptr<RenderFrameHostImpl> render_frame_host_; 151 scoped_ptr<RenderFrameHostImpl> render_frame_host_;
147 152
148 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxyHost); 153 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxyHost);
149 }; 154 };
150 155
151 } // namespace 156 } // namespace
152 157
153 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ 158 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698