| Index: mojo/public/cpp/bindings/lib/multiplex_router.h
|
| diff --git a/mojo/public/cpp/bindings/lib/multiplex_router.h b/mojo/public/cpp/bindings/lib/multiplex_router.h
|
| index f66d202f79aa66e522a4a9d8db437ad48dde2873..ce1bfc4856b3d257ad4784b944dc1ac0bfd90377 100644
|
| --- a/mojo/public/cpp/bindings/lib/multiplex_router.h
|
| +++ b/mojo/public/cpp/bindings/lib/multiplex_router.h
|
| @@ -172,10 +172,9 @@ class MultiplexRouter
|
| // on to a ref outside of |lock_| before calling this method.
|
| void ProcessTasks(bool force_async);
|
|
|
| - // Returns true to indicate that |task| has been processed. Otherwise the task
|
| - // will be added back to the front of the queue.
|
| + // Returns true to indicate that |task|/|message| has been processed.
|
| bool ProcessNotifyErrorTask(Task* task, bool force_async);
|
| - bool ProcessIncomingMessageTask(Task* task, bool force_async);
|
| + bool ProcessIncomingMessage(Message* message, bool force_async);
|
|
|
| void LockAndCallProcessTasks();
|
|
|
| @@ -188,6 +187,8 @@ class MultiplexRouter
|
|
|
| void RaiseErrorInNonTestingMode();
|
|
|
| + InterfaceEndpoint* FindOrInsertEndpoint(InterfaceId id, bool* inserted);
|
| +
|
| // Whether to set the namespace bit when generating interface IDs. Please see
|
| // comments of kInterfaceIdNamespaceMask.
|
| const bool set_interface_id_namespace_bit_;
|
| @@ -208,6 +209,8 @@ class MultiplexRouter
|
|
|
| std::deque<scoped_ptr<Task>> tasks_;
|
|
|
| + bool posted_to_process_tasks_;
|
| +
|
| bool testing_mode_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MultiplexRouter);
|
|
|