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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 591503003: Allow out-of-process iframes to paint in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 55ee71666f00cdd1408e0c9456c7ec97d3c619a4..3797b91ebb4bc7b3759d513d0684293ea4c404fc 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1065,8 +1065,17 @@ void RenderFrameImpl::OnSwapOut(int proxy_routing_id) {
// Let subframes know that the frame is now rendered remotely, for the
// purposes of compositing and input events.
- if (!is_main_frame)
+ if (!is_main_frame) {
+ // TODO(creis): Remove setIsRemote and send initializeChildFrame from the
+ // RenderFrameProxy, since the RenderFrameHost may be deleted first. In
+ // the meantime, temporarily set this frame's proxy so that the message
+ // is sent via RenderFrameProxy.
+ // See http://crbug.com/416102.
+ DCHECK(!render_frame_proxy_);
+ set_render_frame_proxy(proxy);
frame_->setIsRemote(true);
+ set_render_frame_proxy(NULL);
+ }
// Replace the page with a blank dummy URL. The unload handler will not be
// run a second time, thanks to a check in FrameLoader::stopLoading.
@@ -3182,7 +3191,7 @@ void RenderFrameImpl::forwardInputEvent(const blink::WebInputEvent* event) {
void RenderFrameImpl::initializeChildFrame(const blink::WebRect& frame_rect,
float scale_factor) {
- Send(new FrameHostMsg_InitializeChildFrame(
+ render_frame_proxy_->Send(new FrameHostMsg_InitializeChildFrame(
routing_id_, frame_rect, scale_factor));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698