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

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: Re-applying same patch Created 5 years, 11 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/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 3decd78c85acd9f27ffa516f27d04656ea172c0a..e69a20d0f0459051ae9bbc2460a3ea56c18115c5 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -43,6 +43,7 @@ class GURL;
class TransportDIB;
struct FrameHostMsg_AddNavigationTransitionData_Params;
struct FrameMsg_Navigate_Params;
+struct FrameMsg_NewFrame_WidgetParams;
struct FrameMsg_RequestNavigation_Params;
namespace blink {
@@ -71,6 +72,7 @@ class WebEncryptedMediaClientImpl;
namespace content {
class ChildFrameCompositingHelper;
+class CompositorDependencies;
class ExternalPopupMenu;
class GeolocationDispatcher;
class ManifestManager;
@@ -124,7 +126,9 @@ class CONTENT_EXPORT RenderFrameImpl
static void CreateFrame(int routing_id,
int parent_routing_id,
int proxy_routing_id,
- const FrameReplicationState& replicated_state);
+ const FrameReplicationState& replicated_state,
+ CompositorDependencies* compositor_deps,
+ const FrameMsg_NewFrame_WidgetParams& params);
// Returns the RenderFrameImpl for the given routing ID.
static RenderFrameImpl* FromRoutingID(int routing_id);
@@ -741,6 +745,13 @@ class CONTENT_EXPORT RenderFrameImpl
// TODO(creis): Remove this after switching to PlzNavigate.
int proxy_routing_id_;
+ // Used when the RenderFrame is a local root. For now, RenderWidgets are
+ // 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.
+ // TODO(kenrb): Correct the above statement when top-level frames have their
+ // 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