Index: third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h |
diff --git a/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h b/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h |
index 80f42f030b6f84ccd6e126986b9045c077848043..a64c720ede6f5a1830aca777b9a55310c1ab6dec 100644 |
--- a/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h |
+++ b/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h |
@@ -53,7 +53,6 @@ class KURL; |
class ThreadableLoadingContext; |
class WebSocketChannelSyncHelper; |
class WorkerGlobalScope; |
-class WorkerLoaderProxy; |
class WorkerWebSocketChannel final : public WebSocketChannel { |
WTF_MAKE_NONCOPYABLE(WorkerWebSocketChannel); |
@@ -98,7 +97,6 @@ class WorkerWebSocketChannel final : public WebSocketChannel { |
public: |
Peer(Bridge*, |
- PassRefPtr<WorkerLoaderProxy>, |
RefPtr<WebTaskRunner>, |
WorkerThreadLifecycleContext*); |
~Peer() override; |
@@ -137,7 +135,6 @@ class WorkerWebSocketChannel final : public WebSocketChannel { |
private: |
CrossThreadWeakPersistent<Bridge> bridge_; |
- RefPtr<WorkerLoaderProxy> loader_proxy_; |
RefPtr<WebTaskRunner> worker_networking_task_runner_; |
Member<WebSocketChannel> main_web_socket_channel_; |
}; |
@@ -167,7 +164,7 @@ class WorkerWebSocketChannel final : public WebSocketChannel { |
void Disconnect(); |
void ConnectOnMainThread(std::unique_ptr<SourceLocation>, |
- RefPtr<WorkerLoaderProxy>, |
+ ThreadableLoadingContext*, |
RefPtr<WebTaskRunner>, |
WorkerThreadLifecycleContext*, |
const KURL&, |
@@ -184,7 +181,7 @@ class WorkerWebSocketChannel final : public WebSocketChannel { |
private: |
Member<WebSocketChannelClient> client_; |
Member<WorkerGlobalScope> worker_global_scope_; |
- RefPtr<WorkerLoaderProxy> loader_proxy_; |
+ CrossThreadPersistent<ThreadableLoadingContext> loading_context_; |
haraken
2017/04/25 16:53:43
Add a comment and mention that this is set on the
nhiroki
2017/05/29 04:20:24
Removed this field because it was unused.
|
CrossThreadPersistent<ParentFrameTaskRunners> parent_frame_task_runners_; |
CrossThreadPersistent<Peer> peer_; |
}; |