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

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

Issue 2422793002: HTML MessagePort as mojo::MessagePipeHandle (Closed)
Patch Set: Add missing ScopedAsyncTaskScheduler instance for the new unit tests; required by a recent change t… Created 3 years, 10 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 | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/message_port_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index e0d773bff7bebc04d3d1a1ca7a88758a0640fae8..42cdb39dcc545220565603699586098725acee5e 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -14,7 +14,6 @@
#include "content/browser/frame_host/navigator.h"
#include "content/browser/frame_host/render_frame_host_delegate.h"
#include "content/browser/frame_host/render_widget_host_view_child_frame.h"
-#include "content/browser/message_port_message_filter.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/site_instance_impl.h"
@@ -319,26 +318,8 @@ void RenderFrameProxyHost::OnRouteMessageEvent(
}
}
- if (!params.message_ports.empty()) {
- // Updating the message port information has to be done in the IO thread;
- // MessagePortMessageFilter::RouteMessageEventWithMessagePorts will send
- // FrameMsg_PostMessageEvent after it's done. Note that a trivial solution
- // would've been to post a task on the IO thread to do the IO-thread-bound
- // work, and make that post a task back to WebContentsImpl in the UI
- // thread. But we cannot do that, since there's nothing to guarantee that
- // WebContentsImpl stays alive during the round trip.
- scoped_refptr<MessagePortMessageFilter> message_port_message_filter(
- static_cast<RenderProcessHostImpl*>(target_rfh->GetProcess())
- ->message_port_message_filter());
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts,
- message_port_message_filter, target_rfh->GetRoutingID(),
- new_params));
- } else {
- target_rfh->Send(
- new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params));
- }
+ target_rfh->Send(
+ new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params));
}
void RenderFrameProxyHost::OnDidChangeOpener(int32_t opener_routing_id) {
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/message_port_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698