Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Issue 2224713002: Move WebSocketHandleImpl into Blink (Closed)

Created:
4 years, 4 months ago by darin (slow to review)
Modified:
4 years, 3 months ago
Reviewers:
Tom Sepez, yhirano
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, nasko+codewatch_chromium.org, yzshen+watch_chromium.org, kinuko+watch, ben+mojo_chromium.org, yhirano+watch_chromium.org, jam, abarth-chromium, dglazkov+blink, darin-cc_chromium.org, gavinp+loader_chromium.org, blink-reviews, blink-reviews-api_chromium.org, mlamouri+watch-content_chromium.org, creis+watch_chromium.org, loading-reviews_chromium.org, haraken, Nate Chapin, tyoshino+watch_chromium.org, Aaron Boodman, darin (slow to review)
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Move WebSocketHandleImpl into Blink TBR=tsepez@chromium.org Committed: https://crrev.com/b8df2228b7039e0326e6098e74547539fe9ef4e0 Cr-Commit-Position: refs/heads/master@{#414449}

Patch Set 1 #

Patch Set 2 : Cleanup #

Patch Set 3 : fix unittests #

Patch Set 4 : Plumb base::SingleThreadTaskRunner #

Patch Set 5 : Add null check #

Patch Set 6 : Update #

Patch Set 7 : Rebase #

Patch Set 8 : Rebase #

Patch Set 9 : Rebase #

Patch Set 10 : Add back fix for shutdown crash #

Total comments: 1

Patch Set 11 : Fix issue w/ Java bindings missing a dependency #

Total comments: 10

Patch Set 12 : Address review feedback except the location of websocket.mojom #

Unified diffs Side-by-side diffs Delta from patch set Stats (+410 lines, -1108 lines) Patch
M content/browser/DEPS View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -0 lines 0 comments Download
M content/browser/websockets/websocket_impl.h View 1 2 3 4 5 6 7 8 5 chunks +8 lines, -8 lines 0 comments Download
M content/browser/websockets/websocket_impl.cc View 1 2 3 4 5 6 7 8 6 chunks +19 lines, -19 lines 0 comments Download
M content/browser/websockets/websocket_manager.h View 3 chunks +7 lines, -10 lines 0 comments Download
M content/browser/websockets/websocket_manager.cc View 1 2 3 4 5 6 3 chunks +5 lines, -4 lines 0 comments Download
M content/browser/websockets/websocket_manager_unittest.cc View 1 2 5 chunks +8 lines, -8 lines 0 comments Download
M content/common/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 1 chunk +0 lines, -1 line 0 comments Download
D content/common/websocket.mojom View 1 chunk +0 lines, -138 lines 0 comments Download
M content/content_common_mojo_bindings.gyp View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -1 line 0 comments Download
M content/content_renderer.gypi View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -2 lines 0 comments Download
M content/renderer/render_frame_impl.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/render_frame_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -10 lines 0 comments Download
M content/renderer/renderer_blink_platform_impl.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/renderer_blink_platform_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -5 lines 0 comments Download
D content/renderer/websockethandle_impl.h View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -86 lines 0 comments Download
D content/renderer/websockethandle_impl.cc View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -308 lines 0 comments Download
M third_party/WebKit/Source/core/loader/FrameLoaderClient.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -2 lines 0 comments Download
M third_party/WebKit/Source/modules/modules.gypi View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +4 lines, -0 lines 0 comments Download
M third_party/WebKit/Source/modules/websockets/DEPS View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h View 1 2 3 4 5 6 3 chunks +8 lines, -10 lines 0 comments Download
M third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp View 1 2 3 4 5 6 8 chunks +20 lines, -22 lines 0 comments Download
M third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp View 7 chunks +16 lines, -20 lines 0 comments Download
A + third_party/WebKit/Source/modules/websockets/WebSocketHandle.h View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +38 lines, -11 lines 0 comments Download
A third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +253 lines, -0 lines 0 comments Download
A + third_party/WebKit/Source/modules/websockets/WebSocketHandleClient.h View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +10 lines, -12 lines 0 comments Download
M third_party/WebKit/Source/platform/blink_platform.gypi View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -2 lines 0 comments Download
D third_party/WebKit/Source/platform/exported/WebSocketHandshakeRequestInfo.cpp View 1 chunk +0 lines, -63 lines 0 comments Download
D third_party/WebKit/Source/platform/exported/WebSocketHandshakeResponseInfo.cpp View 1 chunk +0 lines, -66 lines 0 comments Download
M third_party/WebKit/Source/web/FrameLoaderClientImpl.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -2 lines 0 comments Download
M third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -5 lines 0 comments Download
M third_party/WebKit/Source/web/WebSharedWorkerImpl.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/WebKit/public/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 1 chunk +2 lines, -1 line 0 comments Download
M third_party/WebKit/public/blink_headers.gypi View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -4 lines 0 comments Download
M third_party/WebKit/public/platform/Platform.h View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -4 lines 0 comments Download
M third_party/WebKit/public/platform/modules/websockets/OWNERS View 1 chunk +3 lines, -0 lines 0 comments Download
D third_party/WebKit/public/platform/modules/websockets/WebSocketHandle.h View 1 chunk +0 lines, -68 lines 0 comments Download
D third_party/WebKit/public/platform/modules/websockets/WebSocketHandleClient.h View 1 chunk +0 lines, -81 lines 0 comments Download
D third_party/WebKit/public/platform/modules/websockets/WebSocketHandshakeRequestInfo.h View 1 chunk +0 lines, -63 lines 0 comments Download
D third_party/WebKit/public/platform/modules/websockets/WebSocketHandshakeResponseInfo.h View 1 chunk +0 lines, -63 lines 0 comments Download
A + third_party/WebKit/public/platform/modules/websockets/websocket.mojom View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/public/web/WebFrameClient.h View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -6 lines 0 comments Download

Messages

Total messages: 56 (44 generated)
darin (slow to review)
https://codereview.chromium.org/2224713002/diff/180001/third_party/WebKit/Source/modules/modules.gypi File third_party/WebKit/Source/modules/modules.gypi (right): https://codereview.chromium.org/2224713002/diff/180001/third_party/WebKit/Source/modules/modules.gypi#newcode2096 third_party/WebKit/Source/modules/modules.gypi:2096: 'websockets/WebSocketHandle.cpp', This is here because DocumentWebSocketChannelTest now has a ...
4 years, 4 months ago (2016-08-22 17:28:33 UTC) #24
yhirano
https://codereview.chromium.org/2224713002/diff/200001/third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp File third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp (right): https://codereview.chromium.org/2224713002/diff/200001/third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp#newcode15 third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp:15: #include "wtf/Functional.h" +wtf/text/WTFString.h https://codereview.chromium.org/2224713002/diff/200001/third_party/WebKit/Source/modules/websockets/WebSocketHandle.h File third_party/WebKit/Source/modules/websockets/WebSocketHandle.h (right): https://codereview.chromium.org/2224713002/diff/200001/third_party/WebKit/Source/modules/websockets/WebSocketHandle.h#newcode36 third_party/WebKit/Source/modules/websockets/WebSocketHandle.h:36: ...
4 years, 4 months ago (2016-08-24 05:01:00 UTC) #35
darin (slow to review)
Thanks for reviewing! https://codereview.chromium.org/2224713002/diff/200001/third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp File third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp (right): https://codereview.chromium.org/2224713002/diff/200001/third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp#newcode15 third_party/WebKit/Source/modules/websockets/WebSocketHandle.cpp:15: #include "wtf/Functional.h" On 2016/08/24 05:01:00, yhirano ...
4 years, 4 months ago (2016-08-24 17:15:05 UTC) #36
yhirano
lgtm
4 years, 4 months ago (2016-08-25 00:28:33 UTC) #41
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2224713002/220001
4 years, 4 months ago (2016-08-25 03:59:36 UTC) #43
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/245715)
4 years, 4 months ago (2016-08-25 04:08:01 UTC) #45
darin (slow to review)
+TBR=tsepez for IPC review. This is actually a no-op. I'm just moving the mojom file ...
4 years, 3 months ago (2016-08-25 15:59:15 UTC) #48
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2224713002/220001
4 years, 3 months ago (2016-08-25 16:00:02 UTC) #50
commit-bot: I haz the power
Committed patchset #12 (id:220001)
4 years, 3 months ago (2016-08-25 16:05:10 UTC) #52
commit-bot: I haz the power
Patchset 12 (id:??) landed as https://crrev.com/b8df2228b7039e0326e6098e74547539fe9ef4e0 Cr-Commit-Position: refs/heads/master@{#414449}
4 years, 3 months ago (2016-08-25 16:07:03 UTC) #54
johnme
This seems to have broken the Android Builder compile: https://uberchromegw.corp.google.com/i/chromium.webkit/builders/Android%20Builder/builds/91243/steps/compile/logs/stdio Linker complains about multiple definition ...
4 years, 3 months ago (2016-08-25 17:05:47 UTC) #55
johnme
4 years, 3 months ago (2016-08-25 17:11:28 UTC) #56
Message was sent while issue was closed.
On 2016/08/25 17:05:47, johnme wrote:
> This seems to have broken the Android Builder compile:
>
https://uberchromegw.corp.google.com/i/chromium.webkit/builders/Android%20Bui...
> Linker complains about multiple definition of
> blink::WebSocketHandle::OnAddChannelResponse and various others in
> webkit_unit_tests

Ah - I see you reverted this in https://codereview.chromium.org/2279763003.
Thanks!

Powered by Google App Engine
This is Rietveld 408576698