third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h - Issue 2840473002: Worker: Remove WorkerLoaderProxy for clean-up

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.h

Issue 2840473002: Worker: Remove WorkerLoaderProxy for clean-up (Closed)

Patch Set: clean up Created 3 years, 7 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 | « third_party/WebKit/Source/modules/webaudio/AudioWorkletThreadTest.cpp ('k') | third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..0f2af37e9119d39b04d3d46d6569862ab23160c7 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,6 @@ class WorkerWebSocketChannel final : public WebSocketChannel {

private:

Member<WebSocketChannelClient> client_;

Member<WorkerGlobalScope> worker_global_scope_;

- RefPtr<WorkerLoaderProxy> loader_proxy_;

CrossThreadPersistent<ParentFrameTaskRunners> parent_frame_task_runners_;

CrossThreadPersistent<Peer> peer_;

};