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

Issue 9677031: Bind RenderViewImpl routing_id to SocketStreamHost (Closed)

Created:
8 years, 9 months ago by Takashi Toyoshima
Modified:
8 years, 9 months ago
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org
Visibility:
Public.

Description

Bind RenderViewImpl routing_id to SocketStreamHost - Set RenderViewImpl's routing_id to WebSocketStresmHandleImpl via dispatchWillOpenSocketStream() - Send the id from WebSocketStreamHandleImpl to SocketStreamHost via IPC SocketStreamHostMsg_Connect This change aim that SocketStreamDispatcher uses SSLManager with routing_id to handle SSL errors. BUG=53836 TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=127964

Patch Set 1 #

Patch Set 2 : rebase #

Patch Set 3 : follow WebKit side renaming #

Total comments: 6

Patch Set 4 : reflects review comments #

Total comments: 2

Patch Set 5 : fix style nits #

Patch Set 6 : rebase #

Total comments: 8

Patch Set 7 : reflects review comments by tony and darin #

Total comments: 8

Patch Set 8 : remove redundant header inclusion #

Patch Set 9 : reflects wtc's comments #

Total comments: 4

Patch Set 10 : non-static AddToHandle #

Patch Set 11 : static AddToHandle with render_view_id #

Total comments: 4

Patch Set 12 : fix the last two nits #

Patch Set 13 : (rebase) #

Patch Set 14 : add CONTENT_EXPORT to ForHandle() #

Unified diffs Side-by-side diffs Delta from patch set Stats (+148 lines, -35 lines) Patch
M content/browser/renderer_host/socket_stream_dispatcher_host.h View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M content/browser/renderer_host/socket_stream_dispatcher_host.cc View 1 2 3 4 5 6 7 8 1 chunk +8 lines, -3 lines 0 comments Download
M content/browser/renderer_host/socket_stream_host.h View 1 2 3 4 5 6 7 8 2 chunks +5 lines, -1 line 0 comments Download
M content/browser/renderer_host/socket_stream_host.cc View 1 2 3 4 5 6 7 8 1 chunk +4 lines, -1 line 0 comments Download
M content/common/socket_stream_dispatcher.cc View 1 2 3 4 5 6 7 2 chunks +8 lines, -1 line 0 comments Download
A content/common/socket_stream_handle_data.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +43 lines, -0 lines 0 comments Download
A content/common/socket_stream_handle_data.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +32 lines, -0 lines 0 comments Download
M content/common/socket_stream_messages.h View 1 2 3 4 5 6 7 8 1 chunk +4 lines, -1 line 0 comments Download
M content/content_common.gypi View 1 2 3 4 5 6 1 chunk +2 lines, -0 lines 0 comments Download
M content/renderer/render_view_impl.h View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +3 lines, -4 lines 0 comments Download
M content/renderer/render_view_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 12 4 chunks +8 lines, -0 lines 0 comments Download
M webkit/glue/websocketstreamhandle_impl.h View 1 2 3 4 5 6 2 chunks +5 lines, -2 lines 0 comments Download
M webkit/glue/websocketstreamhandle_impl.cc View 10 chunks +25 lines, -21 lines 0 comments Download

Messages

Total messages: 27 (0 generated)
Takashi Toyoshima
Hi, This is a part of my change to fix issue 53836. I feel Darin ...
8 years, 9 months ago (2012-03-13 20:06:51 UTC) #1
jam
I looked at this when looking at 9704045. mostly good with just some nits http://codereview.chromium.org/9677031/diff/5001/content/common/socket_stream_messages.h ...
8 years, 9 months ago (2012-03-15 02:01:19 UTC) #2
Takashi Toyoshima
http://codereview.chromium.org/9677031/diff/5001/content/common/socket_stream_messages.h File content/common/socket_stream_messages.h (right): http://codereview.chromium.org/9677031/diff/5001/content/common/socket_stream_messages.h#newcode27 content/common/socket_stream_messages.h:27: int /* routing_id */, On 2012/03/15 02:01:19, John Abd-El-Malek ...
8 years, 9 months ago (2012-03-15 22:49:03 UTC) #3
jam
lgtm you can also derive from base::SupportsUserData http://codereview.chromium.org/9677031/diff/5005/content/renderer/websocketstreamhandle_impl_extradata_impl.h File content/renderer/websocketstreamhandle_impl_extradata_impl.h (right): http://codereview.chromium.org/9677031/diff/5005/content/renderer/websocketstreamhandle_impl_extradata_impl.h#newcode21 content/renderer/websocketstreamhandle_impl_extradata_impl.h:21: int RenderViewId() ...
8 years, 9 months ago (2012-03-16 07:33:59 UTC) #4
Takashi Toyoshima
Thank you John. > you can also derive from base::SupportsUserData Do you mean I can ...
8 years, 9 months ago (2012-03-16 21:44:18 UTC) #5
Takashi Toyoshima
http://codereview.chromium.org/9677031/diff/5005/content/renderer/websocketstreamhandle_impl_extradata_impl.h File content/renderer/websocketstreamhandle_impl_extradata_impl.h (right): http://codereview.chromium.org/9677031/diff/5005/content/renderer/websocketstreamhandle_impl_extradata_impl.h#newcode21 content/renderer/websocketstreamhandle_impl_extradata_impl.h:21: int RenderViewId() const { return render_view_id_; } On 2012/03/16 ...
8 years, 9 months ago (2012-03-16 22:09:26 UTC) #6
jam
On 2012/03/16 21:44:18, toyoshim wrote: > Thank you John. > > > you can also ...
8 years, 9 months ago (2012-03-19 16:00:47 UTC) #7
Takashi Toyoshima
Hi, jamesr@ and tony@. This CL requires one more OWNERS review on webkit/. So, I ...
8 years, 9 months ago (2012-03-19 20:43:09 UTC) #8
tony
webkit/glue LGTM https://chromiumcodereview.appspot.com/9677031/diff/16001/webkit/glue/websocketstreamhandle_impl.h File webkit/glue/websocketstreamhandle_impl.h (right): https://chromiumcodereview.appspot.com/9677031/diff/16001/webkit/glue/websocketstreamhandle_impl.h#newcode30 webkit/glue/websocketstreamhandle_impl.h:30: virtual void close() OVERRIDE; I would not ...
8 years, 9 months ago (2012-03-19 20:52:56 UTC) #9
darin (slow to review)
https://chromiumcodereview.appspot.com/9677031/diff/16001/content/common/socket_stream_dispatcher.cc File content/common/socket_stream_dispatcher.cc (right): https://chromiumcodereview.appspot.com/9677031/diff/16001/content/common/socket_stream_dispatcher.cc#newcode152 content/common/socket_stream_dispatcher.cc:152: webkit_glue::WebSocketStreamHandleImpl* handle = you might consider hiding some of ...
8 years, 9 months ago (2012-03-19 20:58:28 UTC) #10
Takashi Toyoshima
https://chromiumcodereview.appspot.com/9677031/diff/16001/content/common/socket_stream_dispatcher.cc File content/common/socket_stream_dispatcher.cc (right): https://chromiumcodereview.appspot.com/9677031/diff/16001/content/common/socket_stream_dispatcher.cc#newcode152 content/common/socket_stream_dispatcher.cc:152: webkit_glue::WebSocketStreamHandleImpl* handle = Is doing static cast in SocketHandleData::ForHandle() ...
8 years, 9 months ago (2012-03-19 22:58:44 UTC) #11
darin (slow to review)
On Mon, Mar 19, 2012 at 3:58 PM, <toyoshim@chromium.org> wrote: > > https://chromiumcodereview.**appspot.com/9677031/diff/** > 16001/content/common/socket_**stream_dispatcher.cc<https://chromiumcodereview.appspot.com/9677031/diff/16001/content/common/socket_stream_dispatcher.cc> ...
8 years, 9 months ago (2012-03-19 23:06:26 UTC) #12
wtc
Drive-by review comments on patch set 7: toyoshim: several people more qualified than me already ...
8 years, 9 months ago (2012-03-19 23:21:03 UTC) #13
Takashi Toyoshima
> I think that's OK assuming Chrome only ever has a single implementation > of ...
8 years, 9 months ago (2012-03-19 23:34:56 UTC) #14
Takashi Toyoshima
Thank you all reviewers. I believe I reflects all reviewers' comments at Patch Set 9. ...
8 years, 9 months ago (2012-03-20 00:18:03 UTC) #15
darin (slow to review)
On Mon, Mar 19, 2012 at 4:34 PM, <toyoshim@chromium.org> wrote: > I think that's OK ...
8 years, 9 months ago (2012-03-20 06:42:37 UTC) #16
darin (slow to review)
https://chromiumcodereview.appspot.com/9677031/diff/20002/content/common/socket_stream_dispatcher.cc File content/common/socket_stream_dispatcher.cc (right): https://chromiumcodereview.appspot.com/9677031/diff/20002/content/common/socket_stream_dispatcher.cc#newcode21 content/common/socket_stream_dispatcher.cc:21: #include "webkit/glue/websocketstreamhandle_impl.h" still needed? https://chromiumcodereview.appspot.com/9677031/diff/18010/content/common/socket_stream_handle_data.cc File content/common/socket_stream_handle_data.cc (right): https://chromiumcodereview.appspot.com/9677031/diff/18010/content/common/socket_stream_handle_data.cc#newcode17 ...
8 years, 9 months ago (2012-03-20 06:46:59 UTC) #17
Takashi Toyoshima
Thank you, Darin. My CL looks pretty better than before. If you grant me, I'll ...
8 years, 9 months ago (2012-03-20 18:19:39 UTC) #18
darin (slow to review)
LGTM https://chromiumcodereview.appspot.com/9677031/diff/29001/content/common/socket_stream_handle_data.cc File content/common/socket_stream_handle_data.cc (right): https://chromiumcodereview.appspot.com/9677031/diff/29001/content/common/socket_stream_handle_data.cc#newcode15 content/common/socket_stream_handle_data.cc:15: DCHECK(handle); nit: more conventional to use NOTREACHED here ...
8 years, 9 months ago (2012-03-20 20:01:00 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/toyoshim@chromium.org/9677031/33001
8 years, 9 months ago (2012-03-21 00:57:11 UTC) #20
Takashi Toyoshima
Thank you. I applied these comments before submitting. https://chromiumcodereview.appspot.com/9677031/diff/29001/content/common/socket_stream_handle_data.cc File content/common/socket_stream_handle_data.cc (right): https://chromiumcodereview.appspot.com/9677031/diff/29001/content/common/socket_stream_handle_data.cc#newcode15 content/common/socket_stream_handle_data.cc:15: DCHECK(handle); ...
8 years, 9 months ago (2012-03-21 00:57:17 UTC) #21
commit-bot: I haz the power
Try job failure for 9677031-33001 (retry) on win for step "compile" (clobber build). It's a ...
8 years, 9 months ago (2012-03-21 02:26:22 UTC) #22
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/toyoshim@chromium.org/9677031/33001
8 years, 9 months ago (2012-03-21 05:21:27 UTC) #23
commit-bot: I haz the power
Try job failure for 9677031-33001 (retry) on win for step "compile" (clobber build). It's a ...
8 years, 9 months ago (2012-03-21 06:20:44 UTC) #24
Takashi Toyoshima
Oops, this looks actual compile error. I guess ForHandle must be exported as CONTENT_EXPORT for ...
8 years, 9 months ago (2012-03-21 13:07:43 UTC) #25
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/toyoshim@chromium.org/9677031/43001
8 years, 9 months ago (2012-03-21 14:36:41 UTC) #26
commit-bot: I haz the power
8 years, 9 months ago (2012-03-21 15:39:40 UTC) #27
Change committed as 127964

Powered by Google App Engine
This is Rietveld 408576698