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

Side by Side Diff: content/browser/renderer_host/socket_stream_host.cc

Issue 10458057: Websocket should fire 'error' event if no server available (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/socket_stream_host.h" 5 #include "content/browser/renderer_host/socket_stream_host.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/common/socket_stream.h" 8 #include "content/common/socket_stream.h"
9 #include "net/socket_stream/socket_stream_job.h" 9 #include "net/socket_stream/socket_stream_job.h"
10 10
(...skipping 15 matching lines...) Expand all
26 int socket_id) 26 int socket_id)
27 : delegate_(delegate), 27 : delegate_(delegate),
28 render_view_id_(render_view_id), 28 render_view_id_(render_view_id),
29 socket_id_(socket_id) { 29 socket_id_(socket_id) {
30 DCHECK_NE(socket_id_, content::kNoSocketId); 30 DCHECK_NE(socket_id_, content::kNoSocketId);
31 VLOG(1) << "SocketStreamHost: render_view_id=" << render_view_id 31 VLOG(1) << "SocketStreamHost: render_view_id=" << render_view_id
32 << " socket_id=" << socket_id_; 32 << " socket_id=" << socket_id_;
33 } 33 }
34 34
35 /* static */ 35 /* static */
36 int SocketStreamHost::SocketIdFromSocketStream(net::SocketStream* socket) { 36 int SocketStreamHost::SocketIdFromSocketStream(
37 const net::SocketStream* socket) {
37 net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey); 38 net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey);
38 if (d) { 39 if (d) {
39 SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d); 40 SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d);
40 return socket_stream_id->socket_id(); 41 return socket_stream_id->socket_id();
41 } 42 }
42 return content::kNoSocketId; 43 return content::kNoSocketId;
43 } 44 }
44 45
45 SocketStreamHost::~SocketStreamHost() { 46 SocketStreamHost::~SocketStreamHost() {
46 VLOG(1) << "SocketStreamHost destructed socket_id=" << socket_id_; 47 VLOG(1) << "SocketStreamHost destructed socket_id=" << socket_id_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 return; 84 return;
84 socket_->CancelWithSSLError(ssl_info); 85 socket_->CancelWithSSLError(ssl_info);
85 } 86 }
86 87
87 void SocketStreamHost::ContinueDespiteError() { 88 void SocketStreamHost::ContinueDespiteError() {
88 VLOG(1) << "SocketStreamHost::ContinueDespiteError"; 89 VLOG(1) << "SocketStreamHost::ContinueDespiteError";
89 if (!socket_) 90 if (!socket_)
90 return; 91 return;
91 socket_->ContinueDespiteError(); 92 socket_->ContinueDespiteError();
92 } 93 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698