WebSocket: Rename DocumentWebSocketChannel to WebSocketChannelImpl [chromium/src : master]

Hiroki Nakagawa (Gerrit)

unread,

Apr 23, 2018, 11:42:42 PM4/23/18

to Yutaka Hirano, Adam Rice, blink-...@chromium.org, yhiran...@chromium.org

Hiroki Nakagawa would like Yutaka Hirano and Adam Rice to review this change.

WebSocket: Rename DocumentWebSocketChannel to WebSocketChannelImpl

DocumentWebSocketChannel is used for WebSocket on Document, but it's also used
on WorkerGlobalScope when the off-main-thread WebSocket is enabled. This CL
renames DocumentWebSocketChannel to WebSocketChannelImpl for reducing confusion.

Before this CL, the class hierarchy is as follows:

- WebSocketChannel
  - DocumentWebSocketChannel
  - WorkerWebSocketChannel
  - MockWebSocketChannel

After this CL, the class hierarchy is as follows:

- WebSocketChannel
  - WebSocketChannelImpl
  - WorkerWebSocketChannel (to be removed)
  - MockWebSocketChannel

After the off-main-thread WebSocketChannel is enabled by default,
WorkerWebSocketChannel is removed.

Bug: 825740
Change-Id: If9998a7c30cfda05d6d3ffb6f7b4b4437edf0aed
---
M third_party/blink/renderer/modules/BUILD.gn
M third_party/blink/renderer/modules/websockets/BUILD.gn
M third_party/blink/renderer/modules/websockets/README.md
M third_party/blink/renderer/modules/websockets/web_pepper_socket_impl.cc
M third_party/blink/renderer/modules/websockets/web_socket_channel.cc
R third_party/blink/renderer/modules/websockets/web_socket_channel_impl.cc
R third_party/blink/renderer/modules/websockets/web_socket_channel_impl.h
R third_party/blink/renderer/modules/websockets/web_socket_channel_impl_test.cc
M third_party/blink/renderer/modules/websockets/worker_web_socket_channel.cc
M third_party/blink/renderer/modules/websockets/worker_web_socket_channel.h
10 files changed, 169 insertions(+), 181 deletions(-)

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Hiroki Nakagawa (Gerrit)

unread,

Apr 23, 2018, 11:42:44 PM4/23/18

to blink-...@chromium.org, yhiran...@chromium.org, Yutaka Hirano, Adam Rice, Commit Bot, chromium...@chromium.org, Kentaro Hara

+yhirano@,ricea@: PTAL

View Change

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Yutaka Hirano (Gerrit)

unread,

Apr 24, 2018, 12:57:47 AM4/24/18

to Hiroki Nakagawa, blink-...@chromium.org, yhiran...@chromium.org, Yutaka Hirano, Adam Rice, Commit Bot, chromium...@chromium.org, Kentaro Hara

Patch set 2:Code-Review +1

View Change

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Kentaro Hara (Gerrit)

unread,

Apr 24, 2018, 12:58:41 AM4/24/18

to Hiroki Nakagawa, blink-...@chromium.org, yhiran...@chromium.org, Yutaka Hirano, Adam Rice, Commit Bot, chromium...@chromium.org

modules/ LGTM

Patch set 2:Code-Review +1

View Change

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Hiroki Nakagawa (Gerrit)

unread,

Apr 24, 2018, 1:09:31 AM4/24/18

to blink-...@chromium.org, yhiran...@chromium.org, Kentaro Hara, Yutaka Hirano, Adam Rice, Commit Bot, chromium...@chromium.org

Patch set 2:Commit-Queue +2

View Change

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Commit Bot (Gerrit)

unread,

Apr 24, 2018, 3:47:27 AM4/24/18

to Hiroki Nakagawa, blink-...@chromium.org, yhiran...@chromium.org, Kentaro Hara, Yutaka Hirano, Adam Rice, chromium...@chromium.org

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/535135)

View Change

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Hiroki Nakagawa (Gerrit)

unread,

Apr 24, 2018, 3:52:09 AM4/24/18

to blink-...@chromium.org, yhiran...@chromium.org, Kentaro Hara, Yutaka Hirano, Adam Rice, Commit Bot, chromium...@chromium.org

Patch set 2:Commit-Queue +2

View Change

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Commit Bot (Gerrit)

unread,

Apr 24, 2018, 4:48:50 AM4/24/18

to Hiroki Nakagawa, blink-...@chromium.org, yhiran...@chromium.org, Kentaro Hara, Yutaka Hirano, Adam Rice, chromium...@chromium.org

Commit Bot merged this change.

View Change

Approvals:
  Yutaka Hirano: Looks good to me
  Kentaro Hara: Looks good to me
  Hiroki Nakagawa: Commit

WebSocket: Rename DocumentWebSocketChannel to WebSocketChannelImpl

DocumentWebSocketChannel is used for WebSocket on Document, but it's also used
on WorkerGlobalScope when the off-main-thread WebSocket is enabled. This CL
renames DocumentWebSocketChannel to WebSocketChannelImpl for reducing confusion.

Before this CL, the class hierarchy is as follows:

- WebSocketChannel
  - DocumentWebSocketChannel
  - WorkerWebSocketChannel
  - MockWebSocketChannel

After this CL, the class hierarchy is as follows:

- WebSocketChannel
  - WebSocketChannelImpl
  - WorkerWebSocketChannel (to be removed)
  - MockWebSocketChannel

After the off-main-thread WebSocketChannel is enabled by default,
WorkerWebSocketChannel is removed.

Bug: 825740
Change-Id: If9998a7c30cfda05d6d3ffb6f7b4b4437edf0aed

Reviewed-on: https://chromium-review.googlesource.com/1025240
Reviewed-by: Yutaka Hirano <yhi...@chromium.org>
Reviewed-by: Kentaro Hara <har...@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhi...@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553037}


---
M third_party/blink/renderer/modules/BUILD.gn
M third_party/blink/renderer/modules/websockets/BUILD.gn
M third_party/blink/renderer/modules/websockets/README.md
M third_party/blink/renderer/modules/websockets/web_pepper_socket_impl.cc
M third_party/blink/renderer/modules/websockets/web_socket_channel.cc
R third_party/blink/renderer/modules/websockets/web_socket_channel_impl.cc
R third_party/blink/renderer/modules/websockets/web_socket_channel_impl.h
R third_party/blink/renderer/modules/websockets/web_socket_channel_impl_test.cc
M third_party/blink/renderer/modules/websockets/worker_web_socket_channel.cc
M third_party/blink/renderer/modules/websockets/worker_web_socket_channel.h
10 files changed, 169 insertions(+), 181 deletions(-)

To view, visit change 1025240. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward