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

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

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 class WebContentDecryptionModule; 83 class WebContentDecryptionModule;
84 class WebMouseEvent; 84 class WebMouseEvent;
85 class WebPresentationClient; 85 class WebPresentationClient;
86 class WebPushClient; 86 class WebPushClient;
87 class WebSecurityOrigin; 87 class WebSecurityOrigin;
88 enum class WebCachePolicy; 88 enum class WebCachePolicy;
89 struct WebCompositionUnderline; 89 struct WebCompositionUnderline;
90 struct WebContextMenuData; 90 struct WebContextMenuData;
91 struct WebCursorInfo; 91 struct WebCursorInfo;
92 struct WebFindOptions; 92 struct WebFindOptions;
93 struct WebScreenInfo;
94 } // namespace blink 93 } // namespace blink
95 94
96 namespace gfx { 95 namespace gfx {
97 class Point; 96 class Point;
98 class Range; 97 class Range;
99 class Rect; 98 class Rect;
100 } 99 }
101 100
102 namespace media { 101 namespace media {
103 class CdmFactory; 102 class CdmFactory;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 class WakeLockDispatcher; 153 class WakeLockDispatcher;
155 struct CommonNavigationParams; 154 struct CommonNavigationParams;
156 struct CustomContextMenuContext; 155 struct CustomContextMenuContext;
157 struct FileChooserFileInfo; 156 struct FileChooserFileInfo;
158 struct FileChooserParams; 157 struct FileChooserParams;
159 struct FrameOwnerProperties; 158 struct FrameOwnerProperties;
160 struct FrameReplicationState; 159 struct FrameReplicationState;
161 struct NavigationParams; 160 struct NavigationParams;
162 struct RequestNavigationParams; 161 struct RequestNavigationParams;
163 struct ResourceResponseHead; 162 struct ResourceResponseHead;
163 struct ScreenInfo;
164 struct StartNavigationParams; 164 struct StartNavigationParams;
165 struct StreamOverrideParameters; 165 struct StreamOverrideParameters;
166 166
167 class CONTENT_EXPORT RenderFrameImpl 167 class CONTENT_EXPORT RenderFrameImpl
168 : public RenderFrame, 168 : public RenderFrame,
169 NON_EXPORTED_BASE(mojom::Frame), 169 NON_EXPORTED_BASE(mojom::Frame),
170 NON_EXPORTED_BASE(public blink::WebFrameClient), 170 NON_EXPORTED_BASE(public blink::WebFrameClient),
171 NON_EXPORTED_BASE(public blink::WebFrameSerializerClient) { 171 NON_EXPORTED_BASE(public blink::WebFrameSerializerClient) {
172 public: 172 public:
173 // Creates a new RenderFrame as the main frame of |render_view|. 173 // Creates a new RenderFrame as the main frame of |render_view|.
174 static RenderFrameImpl* CreateMainFrame( 174 static RenderFrameImpl* CreateMainFrame(
175 RenderViewImpl* render_view, 175 RenderViewImpl* render_view,
176 int32_t routing_id, 176 int32_t routing_id,
177 int32_t widget_routing_id, 177 int32_t widget_routing_id,
178 bool hidden, 178 bool hidden,
179 const blink::WebScreenInfo& screen_info, 179 const ScreenInfo& screen_info,
180 CompositorDependencies* compositor_deps, 180 CompositorDependencies* compositor_deps,
181 blink::WebFrame* opener); 181 blink::WebFrame* opener);
182 182
183 // Creates a new RenderFrame with |routing_id|. If |proxy_routing_id| is 183 // Creates a new RenderFrame with |routing_id|. If |proxy_routing_id| is
184 // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into 184 // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into
185 // the frame tree after the frame identified by 185 // the frame tree after the frame identified by
186 // |previous_sibling_routing_id|, or as the first child if 186 // |previous_sibling_routing_id|, or as the first child if
187 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is 187 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is
188 // semi-orphaned until it commits, at which point it replaces the proxy 188 // semi-orphaned until it commits, at which point it replaces the proxy
189 // identified by |proxy_routing_id|. The frame's opener is set to the frame 189 // identified by |proxy_routing_id|. The frame's opener is set to the frame
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 bool has_accessed_initial_document_; 1282 bool has_accessed_initial_document_;
1283 1283
1284 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1284 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1285 1285
1286 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1286 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1287 }; 1287 };
1288 1288
1289 } // namespace content 1289 } // namespace content
1290 1290
1291 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1291 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698