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

Unified Diff: content/renderer/render_frame_impl.h

Issue 616133002: Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format, changed WebWidget creation Created 6 years 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/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index bf354fffb6926602d1298bd9c90d4bf46c6943f9..57d35ba291680b4aa036eab4f4d894d3c81f6ab6 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -44,6 +44,7 @@ class TransportDIB;
struct FrameHostMsg_AddNavigationTransitionData_Params;
struct FrameMsg_Navigate_Params;
struct FrameMsg_RequestNavigation_Params;
+struct FrameMsg_NewFrame_WidgetParams;
Charlie Reis 2014/12/18 18:04:14 nit: Alphabetize
kenrb 2015/01/05 21:15:31 Done.
namespace blink {
class WebGeolocationClient;
@@ -118,7 +119,8 @@ class CONTENT_EXPORT RenderFrameImpl
// through Blink and Create.
static void CreateFrame(int routing_id,
int parent_routing_id,
- int proxy_routing_id);
+ int proxy_routing_id,
+ const FrameMsg_NewFrame_WidgetParams& params);
// Returns the RenderFrameImpl for the given routing ID.
static RenderFrameImpl* FromRoutingID(int routing_id);
@@ -719,6 +721,13 @@ class CONTENT_EXPORT RenderFrameImpl
// TODO(creis): Remove this after switching to PlzNavigate.
int proxy_routing_id_;
+ // Used when the RenderFrame is a local frame root; for now RenderWidgets are
nasko 2014/12/17 22:51:30 nit: s/local frame root/local root/
Charlie Reis 2014/12/18 18:04:14 nit: Split into two sentences rather than using a
kenrb 2015/01/05 21:15:31 Done.
+ // added only when a child frame is in a different process from its parent
+ // frame, but eventually this will also apply to top-level frames.
+ // FIXME(kenrb): Correct the above statement when top-level frames have their
nasko 2014/12/17 22:51:30 nit: s/FIXME/TODO/
kenrb 2015/01/05 21:15:31 Done.
+ // own RenderWidgets.
+ scoped_refptr<RenderWidget> render_widget_;
+
#if defined(ENABLE_PLUGINS)
// Current text input composition text. Empty if no composition is in
// progress.

Powered by Google App Engine
This is Rietveld 408576698