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

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

Issue 17068011: Revert "Implement WebFrameClient in RenderFrame and proxy all calls to RenderView (for now)." (r207… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/public/renderer/render_frame.h" 9 #include "content/public/renderer/render_frame.h"
10 #include "ipc/ipc_message.h" 10 #include "ipc/ipc_message.h"
11 #include "third_party/WebKit/public/web/WebDataSource.h" 11 #include "third_party/WebKit/public/web/WebDataSource.h"
12 #include "third_party/WebKit/public/web/WebFrameClient.h" 12 #include "third_party/WebKit/public/web/WebFrameClient.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 class RenderViewImpl; 16 class RenderViewImpl;
17 17
18 class CONTENT_EXPORT RenderFrameImpl 18 class CONTENT_EXPORT RenderFrameImpl
19 : public RenderFrame, 19 : public RenderFrame,
20 NON_EXPORTED_BASE(public WebKit::WebFrameClient) { 20 NON_EXPORTED_BASE(public WebKit::WebFrameClient) {
21 public: 21 public:
22 // Creates a new RenderFrame. |render_view| is the RenderView object that this 22 RenderFrameImpl(RenderViewImpl* render_view, int routing_id);
23 // frame belongs to.
24 static RenderFrameImpl* Create(RenderViewImpl* render_view, int32 routing_id);
25
26 // Used by content_layouttest_support to hook into the creation of
27 // RenderFrameImpls.
28 static void InstallCreateHook(
29 RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32));
30
31 virtual ~RenderFrameImpl(); 23 virtual ~RenderFrameImpl();
32 24
33 // IPC::Sender 25 // IPC::Sender
34 virtual bool Send(IPC::Message* msg) OVERRIDE; 26 virtual bool Send(IPC::Message* msg) OVERRIDE;
35 27
36 // IPC::Listener 28 // IPC::Listener
37 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 29 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
38 30
39 // WebKit::WebFrameClient implementation ------------------------------------- 31 // WebKit::WebFrameClient implementation -------------------------------------
40 virtual WebKit::WebPlugin* createPlugin( 32 virtual WebKit::WebPlugin* createPlugin(
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 WebKit::WebFrame* frame, 201 WebKit::WebFrame* frame,
210 const WebKit::WebURL& url) OVERRIDE; 202 const WebKit::WebURL& url) OVERRIDE;
211 virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame) OVERRIDE; 203 virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame) OVERRIDE;
212 virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value) OVERRIDE; 204 virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value) OVERRIDE;
213 virtual void didLoseWebGLContext(WebKit::WebFrame* frame, 205 virtual void didLoseWebGLContext(WebKit::WebFrame* frame,
214 int arb_robustness_status_code) OVERRIDE; 206 int arb_robustness_status_code) OVERRIDE;
215 207
216 // RenderFrameImpl methods 208 // RenderFrameImpl methods
217 int routing_id() { return routing_id_; } 209 int routing_id() { return routing_id_; }
218 210
219 protected:
220 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
221
222 private: 211 private:
223 RenderViewImpl* render_view_; 212 RenderViewImpl* render_view_;
224 int routing_id_; 213 int routing_id_;
225 214
226 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 215 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
227 }; 216 };
228 217
229 } // namespace content 218 } // namespace content
230 219
231 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 220 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698