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

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: plumb through surface ID *and* widget surface ID for window.open Created 5 years, 3 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 class WebGeolocationClient; 59 class WebGeolocationClient;
60 class WebMouseEvent; 60 class WebMouseEvent;
61 class WebContentDecryptionModule; 61 class WebContentDecryptionModule;
62 class WebMediaPlayer; 62 class WebMediaPlayer;
63 class WebPresentationClient; 63 class WebPresentationClient;
64 class WebPushClient; 64 class WebPushClient;
65 class WebSecurityOrigin; 65 class WebSecurityOrigin;
66 struct WebCompositionUnderline; 66 struct WebCompositionUnderline;
67 struct WebContextMenuData; 67 struct WebContextMenuData;
68 struct WebCursorInfo; 68 struct WebCursorInfo;
69 struct WebScreenInfo;
69 } 70 }
70 71
71 namespace gfx { 72 namespace gfx {
72 class Point; 73 class Point;
73 class Range; 74 class Range;
74 class Rect; 75 class Rect;
75 } 76 }
76 77
77 namespace media { 78 namespace media {
78 class CdmFactory; 79 class CdmFactory;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 struct StartNavigationParams; 124 struct StartNavigationParams;
124 struct StreamOverrideParameters; 125 struct StreamOverrideParameters;
125 class VRDispatcher; 126 class VRDispatcher;
126 127
127 class CONTENT_EXPORT RenderFrameImpl 128 class CONTENT_EXPORT RenderFrameImpl
128 : public RenderFrame, 129 : public RenderFrame,
129 NON_EXPORTED_BASE(public blink::WebFrameClient), 130 NON_EXPORTED_BASE(public blink::WebFrameClient),
130 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) { 131 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
131 public: 132 public:
132 // Creates a new RenderFrame as the main frame of |render_view|. 133 // Creates a new RenderFrame as the main frame of |render_view|.
133 static RenderFrameImpl* CreateMainFrame(RenderViewImpl* render_view, 134 static RenderFrameImpl* CreateMainFrame(
134 int32 routing_id); 135 RenderViewImpl* render_view,
136 int32 routing_id,
137 int32 widget_routing_id,
138 int32 surface_id,
139 bool hidden,
140 const blink::WebScreenInfo& screen_info,
141 CompositorDependencies* compositor_deps);
135 142
136 // Creates a new RenderFrame with |routing_id|. If |proxy_routing_id| is 143 // Creates a new RenderFrame with |routing_id|. If |proxy_routing_id| is
137 // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into 144 // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into
138 // the frame tree after the frame identified by 145 // the frame tree after the frame identified by
139 // |previous_sibling_routing_id|, or as the first child if 146 // |previous_sibling_routing_id|, or as the first child if
140 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is 147 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is
141 // semi-orphaned until it commits, at which point it replaces the proxy 148 // semi-orphaned until it commits, at which point it replaces the proxy
142 // identified by |proxy_routing_id|. The frame's opener is set to the frame 149 // identified by |proxy_routing_id|. The frame's opener is set to the frame
143 // identified by |opener_routing_id|. The frame is created as a child of the 150 // identified by |opener_routing_id|. The frame is created as a child of the
144 // RenderFrame identified by |parent_routing_id| or as the top-level frame if 151 // RenderFrame identified by |parent_routing_id| or as the top-level frame if
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 #endif 1045 #endif
1039 1046
1040 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1047 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1041 1048
1042 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1049 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1043 }; 1050 };
1044 1051
1045 } // namespace content 1052 } // namespace content
1046 1053
1047 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1054 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698