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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 310413004: Move ownership of CrossProcessFrameConnector to RenderFrameProxyHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a9434607bc0b925aedb5815a8b6fb030371613fc..397fd915ea49d5281d95a1dfc2e6115228019a2d 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -279,8 +279,10 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
if (delegate_->OnMessageReceived(this, msg))
return true;
- if (cross_process_frame_connector_ &&
- cross_process_frame_connector_->OnMessageReceived(msg))
+ RenderFrameProxyHost* proxy =
+ frame_tree_node_->render_manager()->GetProxyToParent();
+ if (proxy && proxy->cross_process_frame_connector() &&
+ proxy->cross_process_frame_connector()->OnMessageReceived(msg))
kenrb 2014/06/19 14:49:04 This doesn't look right to me. The original line h
nasko 2014/06/19 15:46:41 I don't think this is correct and is the reason I'
kenrb 2014/06/19 16:16:32 I feel like I am missing something here. Does inpu
nasko 2014/06/19 16:24:35 Yes : ). Input events are delivered to the child f
kenrb 2014/06/19 17:07:08 Okay, I find GetProxyToParent() is confusing becau
nasko 2014/06/19 17:12:38 The goal is to get the proxy, which is in the same
nasko 2014/06/19 17:52:05 Actually, even at the end, we still need this code
kenrb 2014/06/19 18:03:35 My intent was that everything would go through the
return true;
bool handled = true;

Powered by Google App Engine
This is Rietveld 408576698