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

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

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: Make <webview> work without --site-per-process as well Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/child/webmessageportchannel_impl.h" 10 #include "content/child/webmessageportchannel_impl.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 FrameMap::iterator it = g_frame_map.Get().find(web_frame_); 134 FrameMap::iterator it = g_frame_map.Get().find(web_frame_);
135 CHECK(it != g_frame_map.Get().end()); 135 CHECK(it != g_frame_map.Get().end());
136 CHECK_EQ(it->second, this); 136 CHECK_EQ(it->second, this);
137 g_frame_map.Get().erase(it); 137 g_frame_map.Get().erase(it);
138 138
139 RenderThread::Get()->RemoveRoute(routing_id_); 139 RenderThread::Get()->RemoveRoute(routing_id_);
140 g_routing_id_proxy_map.Get().erase(routing_id_); 140 g_routing_id_proxy_map.Get().erase(routing_id_);
141 } 141 }
142 142
143 void RenderFrameProxy::SetWebRemoteFrame(
144 blink::WebRemoteFrame* remote_frame) {
145 web_frame_ = remote_frame;
146 }
147
143 void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame, 148 void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame,
144 RenderViewImpl* render_view) { 149 RenderViewImpl* render_view) {
145 CHECK(web_frame); 150 CHECK(web_frame);
146 CHECK(render_view); 151 CHECK(render_view);
147 152
148 web_frame_ = web_frame; 153 web_frame_ = web_frame;
149 render_view_ = render_view; 154 render_view_ = render_view;
150 155
151 // TODO(nick): Should all RenderFrameProxies remain observers of their views? 156 // TODO(nick): Should all RenderFrameProxies remain observers of their views?
152 render_view_->RegisterRenderFrameProxy(this); 157 render_view_->RegisterRenderFrameProxy(this);
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 blink::WebUserGestureIndicator::isProcessingUserGesture(); 373 blink::WebUserGestureIndicator::isProcessingUserGesture();
369 blink::WebUserGestureIndicator::consumeUserGesture(); 374 blink::WebUserGestureIndicator::consumeUserGesture();
370 Send(new FrameHostMsg_OpenURL(routing_id_, params)); 375 Send(new FrameHostMsg_OpenURL(routing_id_, params));
371 } 376 }
372 377
373 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) { 378 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) {
374 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); 379 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event));
375 } 380 }
376 381
377 } // namespace 382 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698