diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/ipc/ipc_channel.h | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/ipc/ipc_channel.h')
| -rw-r--r-- | chromium/ipc/ipc_channel.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h index 1c0a89d20d5..527c949349c 100644 --- a/chromium/ipc/ipc_channel.h +++ b/chromium/ipc/ipc_channel.h @@ -18,13 +18,14 @@ #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" +#include "ipc/ipc.mojom.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" -#include "mojo/public/cpp/bindings/associated_group.h" #include "mojo/public/cpp/bindings/associated_interface_ptr.h" #include "mojo/public/cpp/bindings/associated_interface_request.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h" +#include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h" #if defined(OS_POSIX) #include <sys/types.h> @@ -90,9 +91,10 @@ class IPC_EXPORT Channel : public Sender { virtual ~AssociatedInterfaceSupport() {} - // Accesses the AssociatedGroup used to associate new interface endpoints - // with this Channel. Must be safe to call from any thread. - virtual mojo::AssociatedGroup* GetAssociatedGroup() = 0; + // Returns a ThreadSafeForwarded for this channel which can be used to + // safely send mojom::Channel requests from arbitrary threads. + virtual std::unique_ptr<mojo::ThreadSafeForwarder<mojom::Channel>> + CreateThreadSafeChannel() = 0; // Adds an interface factory to this channel for interface |name|. Must be // safe to call from any thread. @@ -121,8 +123,7 @@ class IPC_EXPORT Channel : public Sender { template <typename Interface> void GetRemoteAssociatedInterface( mojo::AssociatedInterfacePtr<Interface>* proxy) { - mojo::AssociatedInterfaceRequest<Interface> request = - mojo::MakeRequest(proxy, GetAssociatedGroup()); + auto request = mojo::MakeRequest(proxy); GetGenericRemoteAssociatedInterface( Interface::Name_, request.PassHandle()); } |