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

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

Issue 18178006: Implement WebFrameClient in RenderFrame and proxy all calls to RenderView (for now). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to resolve conflict. Created 7 years, 5 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 | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include "content/renderer/render_view_impl.h" 7 #include "content/renderer/render_view_impl.h"
8 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 8 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 static RenderFrameImpl* (*g_create_render_frame_impl)(RenderViewImpl*, int32) =
13 NULL;
14
15 // static
16 RenderFrameImpl* RenderFrameImpl::Create(
17 RenderViewImpl* render_view,
18 int32 routing_id) {
19 DCHECK(routing_id != MSG_ROUTING_NONE);
20
21 RenderFrameImpl* render_frame = NULL;
22 if (g_create_render_frame_impl)
23 render_frame = g_create_render_frame_impl(render_view, routing_id);
24 else
25 render_frame = new RenderFrameImpl(render_view, routing_id);
26
27 return render_frame;
28 }
29
30 // static
31 void RenderFrameImpl::InstallCreateHook(
32 RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32)) {
33 CHECK(!g_create_render_frame_impl);
34 g_create_render_frame_impl = create_render_frame_impl;
35 }
36
12 RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id) 37 RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
13 : render_view_(render_view), 38 : render_view_(render_view),
14 routing_id_(routing_id) { 39 routing_id_(routing_id) {
15 } 40 }
16 41
17 RenderFrameImpl::~RenderFrameImpl() { 42 RenderFrameImpl::~RenderFrameImpl() {
18 } 43 }
19 44
20 bool RenderFrameImpl::Send(IPC::Message* message) { 45 bool RenderFrameImpl::Send(IPC::Message* message) {
21 // TODO(nasko): Move away from using the RenderView's Send method once we 46 // TODO(nasko): Move away from using the RenderView's Send method once we
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void RenderFrameImpl::loadURLExternally( 122 void RenderFrameImpl::loadURLExternally(
98 WebKit::WebFrame* frame, 123 WebKit::WebFrame* frame,
99 const WebKit::WebURLRequest& request, 124 const WebKit::WebURLRequest& request,
100 WebKit::WebNavigationPolicy policy, 125 WebKit::WebNavigationPolicy policy,
101 const WebKit::WebString& suggested_name) { 126 const WebKit::WebString& suggested_name) {
102 render_view_->loadURLExternally(frame, request, policy, suggested_name); 127 render_view_->loadURLExternally(frame, request, policy, suggested_name);
103 } 128 }
104 129
105 WebKit::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( 130 WebKit::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
106 WebKit::WebFrame* frame, 131 WebKit::WebFrame* frame,
107 WebKit::WebDataSource::ExtraData* extraData,
108 const WebKit::WebURLRequest& request,
109 WebKit::WebNavigationType type,
110 WebKit::WebNavigationPolicy default_policy,
111 bool is_redirect) {
112 return render_view_->decidePolicyForNavigation(
113 frame, extraData, request, type, default_policy, is_redirect);
114 }
115
116 WebKit::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
117 WebKit::WebFrame* frame,
118 const WebKit::WebURLRequest& request, 132 const WebKit::WebURLRequest& request,
119 WebKit::WebNavigationType type, 133 WebKit::WebNavigationType type,
120 WebKit::WebNavigationPolicy default_policy, 134 WebKit::WebNavigationPolicy default_policy,
121 bool is_redirect) { 135 bool is_redirect) {
122 return render_view_->decidePolicyForNavigation( 136 return render_view_->decidePolicyForNavigation(
123 frame, request, type, default_policy, is_redirect); 137 frame, request, type, default_policy, is_redirect);
124 } 138 }
125 139
126 WebKit::WebURLError RenderFrameImpl::cannotHandleRequestError( 140 WebKit::WebURLError RenderFrameImpl::cannotHandleRequestError(
127 WebKit::WebFrame* frame, 141 WebKit::WebFrame* frame,
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 bool RenderFrameImpl::allowWebGL(WebKit::WebFrame* frame, bool default_value) { 416 bool RenderFrameImpl::allowWebGL(WebKit::WebFrame* frame, bool default_value) {
403 return render_view_->allowWebGL(frame, default_value); 417 return render_view_->allowWebGL(frame, default_value);
404 } 418 }
405 419
406 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, 420 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame,
407 int arb_robustness_status_code) { 421 int arb_robustness_status_code) {
408 render_view_->didLoseWebGLContext(frame, arb_robustness_status_code); 422 render_view_->didLoseWebGLContext(frame, arb_robustness_status_code);
409 } 423 }
410 424
411 } // namespace content 425 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698