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

Unified Diff: ppapi/proxy/dispatcher.cc

Issue 8371008: Revert 106717 - Revert 106677 (caused several PPAPI test timeouts, see http://crbug.com/101154) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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 | « ppapi/proxy/dispatcher.h ('k') | ppapi/proxy/enter_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/dispatcher.cc
===================================================================
--- ppapi/proxy/dispatcher.cc (revision 106763)
+++ ppapi/proxy/dispatcher.cc (working copy)
@@ -21,8 +21,7 @@
GetInterfaceFunc local_get_interface)
: ProxyChannel(remote_process_handle),
disallow_trusted_interfaces_(false), // TODO(brettw) make this settable.
- local_get_interface_(local_get_interface),
- callback_tracker_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ local_get_interface_(local_get_interface) {
}
Dispatcher::~Dispatcher() {
@@ -55,17 +54,6 @@
}
bool Dispatcher::OnMessageReceived(const IPC::Message& msg) {
- // Control messages.
- if (msg.routing_id() == MSG_ROUTING_CONTROL) {
- bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(Dispatcher, msg)
- IPC_MESSAGE_FORWARD(PpapiMsg_ExecuteCallback, &callback_tracker_,
- CallbackTracker::ReceiveExecuteSerializedCallback)
- IPC_MESSAGE_UNHANDLED(handled = false)
- IPC_END_MESSAGE_MAP()
- return handled;
- }
-
if (msg.routing_id() <= 0 || msg.routing_id() >= API_ID_COUNT) {
OnInvalidMessageReceived();
return true;
« no previous file with comments | « ppapi/proxy/dispatcher.h ('k') | ppapi/proxy/enter_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698