diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
| commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
| tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h | |
| parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
| download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz | |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h b/chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h index 6d8b9cf2c7c..446db71f101 100644 --- a/chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h +++ b/chromium/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h @@ -38,8 +38,6 @@ #include "base/memory/scoped_refptr.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" -#include "mojo/public/cpp/bindings/receiver.h" -#include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/system/simple_watcher.h" #include "services/network/public/mojom/websocket.mojom-blink.h" #include "third_party/blink/public/mojom/websockets/websocket_connector.mojom-blink-forward.h" @@ -49,6 +47,9 @@ #include "third_party/blink/renderer/modules/websockets/websocket_channel.h" #include "third_party/blink/renderer/modules/websockets/websocket_message_chunk_accumulator.h" #include "third_party/blink/renderer/platform/heap/handle.h" +#include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" +#include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h" +#include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h" #include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" #include "third_party/blink/renderer/platform/wtf/deque.h" @@ -257,10 +258,17 @@ class MODULES_EXPORT WebSocketChannelImpl final // throttle response when DidConnect is called. std::unique_ptr<ConnectInfo> connect_info_; - mojo::Remote<network::mojom::blink::WebSocket> websocket_; - mojo::Receiver<network::mojom::blink::WebSocketHandshakeClient> - handshake_client_receiver_{this}; - mojo::Receiver<network::mojom::blink::WebSocketClient> client_receiver_; + HeapMojoRemote<network::mojom::blink::WebSocket, + HeapMojoWrapperMode::kWithoutContextObserver> + websocket_; + HeapMojoReceiver<network::mojom::blink::WebSocketHandshakeClient, + WebSocketChannelImpl, + HeapMojoWrapperMode::kWithoutContextObserver> + handshake_client_receiver_; + HeapMojoReceiver<network::mojom::blink::WebSocketClient, + WebSocketChannelImpl, + HeapMojoWrapperMode::kWithoutContextObserver> + client_receiver_; mojo::ScopedDataPipeConsumerHandle readable_; mojo::SimpleWatcher readable_watcher_; |