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

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

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 2 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 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 class WebGeolocationClient; 61 class WebGeolocationClient;
62 class WebMouseEvent; 62 class WebMouseEvent;
63 class WebContentDecryptionModule; 63 class WebContentDecryptionModule;
64 class WebMediaPlayer; 64 class WebMediaPlayer;
65 class WebPresentationClient; 65 class WebPresentationClient;
66 class WebPushClient; 66 class WebPushClient;
67 class WebSecurityOrigin; 67 class WebSecurityOrigin;
68 struct WebCompositionUnderline; 68 struct WebCompositionUnderline;
69 struct WebContextMenuData; 69 struct WebContextMenuData;
70 struct WebCursorInfo; 70 struct WebCursorInfo;
71 struct WebScreenInfo;
71 } 72 }
72 73
73 namespace gfx { 74 namespace gfx {
74 class Point; 75 class Point;
75 class Range; 76 class Range;
76 class Rect; 77 class Rect;
77 } 78 }
78 79
79 namespace media { 80 namespace media {
80 class CdmFactory; 81 class CdmFactory;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 struct StreamOverrideParameters; 131 struct StreamOverrideParameters;
131 class VRDispatcher; 132 class VRDispatcher;
132 133
133 class CONTENT_EXPORT RenderFrameImpl 134 class CONTENT_EXPORT RenderFrameImpl
134 : public RenderFrame, 135 : public RenderFrame,
135 NON_EXPORTED_BASE(public blink::WebFrameClient), 136 NON_EXPORTED_BASE(public blink::WebFrameClient),
136 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate), 137 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate),
137 NON_EXPORTED_BASE(public blink::WebPageSerializerClient) { 138 NON_EXPORTED_BASE(public blink::WebPageSerializerClient) {
138 public: 139 public:
139 // Creates a new RenderFrame as the main frame of |render_view|. 140 // Creates a new RenderFrame as the main frame of |render_view|.
140 static RenderFrameImpl* CreateMainFrame(RenderViewImpl* render_view, 141 static RenderFrameImpl* CreateMainFrame(
141 int32 routing_id); 142 RenderViewImpl* render_view,
143 int32_t routing_id,
144 int32_t widget_routing_id,
145 bool hidden,
146 const blink::WebScreenInfo& screen_info,
147 CompositorDependencies* compositor_deps);
142 148
143 // Creates a new RenderFrame with |routing_id|. If |proxy_routing_id| is 149 // Creates a new RenderFrame with |routing_id|. If |proxy_routing_id| is
144 // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into 150 // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into
145 // the frame tree after the frame identified by 151 // the frame tree after the frame identified by
146 // |previous_sibling_routing_id|, or as the first child if 152 // |previous_sibling_routing_id|, or as the first child if
147 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is 153 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is
148 // semi-orphaned until it commits, at which point it replaces the proxy 154 // semi-orphaned until it commits, at which point it replaces the proxy
149 // identified by |proxy_routing_id|. The frame's opener is set to the frame 155 // identified by |proxy_routing_id|. The frame's opener is set to the frame
150 // identified by |opener_routing_id|. The frame is created as a child of the 156 // identified by |opener_routing_id|. The frame is created as a child of the
151 // RenderFrame identified by |parent_routing_id| or as the top-level frame if 157 // RenderFrame identified by |parent_routing_id| or as the top-level frame if
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 #endif 1076 #endif
1071 1077
1072 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1078 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1073 1079
1074 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1080 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1075 }; 1081 };
1076 1082
1077 } // namespace content 1083 } // namespace content
1078 1084
1079 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1085 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698