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

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

Issue 21388003: Move routing to RenderFrameHost instead of RenderViewHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move global map to .cc file. Created 7 years, 4 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/public/browser/render_frame_host.h ('k') | no next file » | 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 "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "content/child/appcache_dispatcher.h" 9 #include "content/child/appcache_dispatcher.h"
10 #include "content/child/fileapi/file_system_dispatcher.h" 10 #include "content/child/fileapi/file_system_dispatcher.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 routing_id_(routing_id) { 106 routing_id_(routing_id) {
107 } 107 }
108 108
109 RenderFrameImpl::~RenderFrameImpl() { 109 RenderFrameImpl::~RenderFrameImpl() {
110 } 110 }
111 111
112 int RenderFrameImpl::GetRoutingID() const { 112 int RenderFrameImpl::GetRoutingID() const {
113 // TODO(nasko): Until we register RenderFrameHost in the browser process as 113 // TODO(nasko): Until we register RenderFrameHost in the browser process as
114 // a listener, we must route all messages to the RenderViewHost, so use the 114 // a listener, we must route all messages to the RenderViewHost, so use the
115 // routing id of the RenderView for now. 115 // routing id of the RenderView for now.
116 return render_view_->GetRoutingID(); 116 //return render_view_->GetRoutingID();
117 return routing_id_;
117 } 118 }
118 119
119 bool RenderFrameImpl::Send(IPC::Message* message) { 120 bool RenderFrameImpl::Send(IPC::Message* message) {
120 // TODO(nasko): Move away from using the RenderView's Send method once we 121 // TODO(nasko): Move away from using the RenderView's Send method once we
121 // have enough infrastructure and state to make the right checks here. 122 // have enough infrastructure and state to make the right checks here.
122 return render_view_->Send(message); 123 return render_view_->Send(message);
123 } 124 }
124 125
125 bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { 126 bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
126 // Pass the message up to the RenderView, until we have enough 127 // Pass the message up to the RenderView, until we have enough
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 897
897 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, 898 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame,
898 int arb_robustness_status_code) { 899 int arb_robustness_status_code) {
899 Send(new ViewHostMsg_DidLose3DContext( 900 Send(new ViewHostMsg_DidLose3DContext(
900 GURL(frame->top()->document().securityOrigin().toString()), 901 GURL(frame->top()->document().securityOrigin().toString()),
901 THREE_D_API_TYPE_WEBGL, 902 THREE_D_API_TYPE_WEBGL,
902 arb_robustness_status_code)); 903 arb_robustness_status_code));
903 } 904 }
904 905
905 } // namespace content 906 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/render_frame_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698