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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 851333005: Revert of Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « content/common/frame_messages.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 25 matching lines...) Expand all
36 #endif 36 #endif
37 37
38 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
39 #include "content/renderer/media/android/renderer_media_player_manager.h" 39 #include "content/renderer/media/android/renderer_media_player_manager.h"
40 #endif 40 #endif
41 41
42 class GURL; 42 class GURL;
43 class TransportDIB; 43 class TransportDIB;
44 struct FrameHostMsg_AddNavigationTransitionData_Params; 44 struct FrameHostMsg_AddNavigationTransitionData_Params;
45 struct FrameMsg_Navigate_Params; 45 struct FrameMsg_Navigate_Params;
46 struct FrameMsg_NewFrame_WidgetParams;
47 struct FrameMsg_RequestNavigation_Params; 46 struct FrameMsg_RequestNavigation_Params;
48 47
49 namespace blink { 48 namespace blink {
50 class WebGeolocationClient; 49 class WebGeolocationClient;
51 class WebMouseEvent; 50 class WebMouseEvent;
52 class WebContentDecryptionModule; 51 class WebContentDecryptionModule;
53 class WebMediaPlayer; 52 class WebMediaPlayer;
54 class WebPushClient; 53 class WebPushClient;
55 class WebSecurityOrigin; 54 class WebSecurityOrigin;
56 struct WebCompositionUnderline; 55 struct WebCompositionUnderline;
57 struct WebContextMenuData; 56 struct WebContextMenuData;
58 struct WebCursorInfo; 57 struct WebCursorInfo;
59 struct WebTransitionElementData; 58 struct WebTransitionElementData;
60 } 59 }
61 60
62 namespace gfx { 61 namespace gfx {
63 class Point; 62 class Point;
64 class Range; 63 class Range;
65 class Rect; 64 class Rect;
66 } 65 }
67 66
68 namespace media { 67 namespace media {
69 class WebEncryptedMediaClientImpl; 68 class WebEncryptedMediaClientImpl;
70 } 69 }
71 70
72 namespace content { 71 namespace content {
73 72
74 class ChildFrameCompositingHelper; 73 class ChildFrameCompositingHelper;
75 class CompositorDependencies;
76 class ExternalPopupMenu; 74 class ExternalPopupMenu;
77 class GeolocationDispatcher; 75 class GeolocationDispatcher;
78 class ManifestManager; 76 class ManifestManager;
79 class MediaStreamDispatcher; 77 class MediaStreamDispatcher;
80 class MediaStreamRendererFactory; 78 class MediaStreamRendererFactory;
81 class MidiDispatcher; 79 class MidiDispatcher;
82 class NotificationPermissionDispatcher; 80 class NotificationPermissionDispatcher;
83 class PageState; 81 class PageState;
84 class PepperPluginInstanceImpl; 82 class PepperPluginInstanceImpl;
85 class PushMessagingDispatcher; 83 class PushMessagingDispatcher;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // is MSG_ROUTING_NONE. If |proxy_routing_id| is MSG_ROUTING_NONE, it creates 117 // is MSG_ROUTING_NONE. If |proxy_routing_id| is MSG_ROUTING_NONE, it creates
120 // the Blink WebLocalFrame and inserts it in the proper place in the frame 118 // the Blink WebLocalFrame and inserts it in the proper place in the frame
121 // tree. Otherwise, the frame is semi-orphaned until it commits, at which 119 // tree. Otherwise, the frame is semi-orphaned until it commits, at which
122 // point it replaces the proxy identified by |proxy_routing_id|. 120 // point it replaces the proxy identified by |proxy_routing_id|.
123 // Note: This is called only when RenderFrame is being created in response to 121 // Note: This is called only when RenderFrame is being created in response to
124 // IPC message from the browser process. All other frame creation is driven 122 // IPC message from the browser process. All other frame creation is driven
125 // through Blink and Create. 123 // through Blink and Create.
126 static void CreateFrame(int routing_id, 124 static void CreateFrame(int routing_id,
127 int parent_routing_id, 125 int parent_routing_id,
128 int proxy_routing_id, 126 int proxy_routing_id,
129 const FrameReplicationState& replicated_state, 127 const FrameReplicationState& replicated_state);
130 CompositorDependencies* compositor_deps,
131 const FrameMsg_NewFrame_WidgetParams& params);
132 128
133 // Returns the RenderFrameImpl for the given routing ID. 129 // Returns the RenderFrameImpl for the given routing ID.
134 static RenderFrameImpl* FromRoutingID(int routing_id); 130 static RenderFrameImpl* FromRoutingID(int routing_id);
135 131
136 // Just like RenderFrame::FromWebFrame but returns the implementation. 132 // Just like RenderFrame::FromWebFrame but returns the implementation.
137 static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame); 133 static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame);
138 134
139 // Used by content_layouttest_support to hook into the creation of 135 // Used by content_layouttest_support to hook into the creation of
140 // RenderFrameImpls. 136 // RenderFrameImpls.
141 using CreateRenderFrameImplFunction = RenderFrameImpl* (*)(RenderViewImpl*, 137 using CreateRenderFrameImplFunction = RenderFrameImpl* (*)(RenderViewImpl*,
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 // RenderFrame. See https://crbug.com/357747. 734 // RenderFrame. See https://crbug.com/357747.
739 RenderFrameProxy* render_frame_proxy_; 735 RenderFrameProxy* render_frame_proxy_;
740 bool is_detaching_; 736 bool is_detaching_;
741 737
742 // If this frame was created to replace a proxy, this will store the routing 738 // If this frame was created to replace a proxy, this will store the routing
743 // id of the proxy to replace at commit-time, at which time it will be 739 // id of the proxy to replace at commit-time, at which time it will be
744 // cleared. 740 // cleared.
745 // TODO(creis): Remove this after switching to PlzNavigate. 741 // TODO(creis): Remove this after switching to PlzNavigate.
746 int proxy_routing_id_; 742 int proxy_routing_id_;
747 743
748 // Used when the RenderFrame is a local root. For now, RenderWidgets are
749 // added only when a child frame is in a different process from its parent
750 // frame, but eventually this will also apply to top-level frames.
751 // TODO(kenrb): Correct the above statement when top-level frames have their
752 // own RenderWidgets.
753 scoped_refptr<RenderWidget> render_widget_;
754
755 #if defined(ENABLE_PLUGINS) 744 #if defined(ENABLE_PLUGINS)
756 // Current text input composition text. Empty if no composition is in 745 // Current text input composition text. Empty if no composition is in
757 // progress. 746 // progress.
758 base::string16 pepper_composition_text_; 747 base::string16 pepper_composition_text_;
759 748
760 PluginPowerSaverHelper* plugin_power_saver_helper_; 749 PluginPowerSaverHelper* plugin_power_saver_helper_;
761 #endif 750 #endif
762 751
763 RendererWebCookieJarImpl cookie_jar_; 752 RendererWebCookieJarImpl cookie_jar_;
764 753
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 #endif 852 #endif
864 853
865 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 854 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
866 855
867 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 856 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
868 }; 857 };
869 858
870 } // namespace content 859 } // namespace content
871 860
872 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 861 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/common/frame_messages.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698