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

Side by Side Diff: net/spdy/spdy_websocket_stream.cc

Issue 18546008: [SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test, other minor formatting/comment changes Created 7 years, 5 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
« no previous file with comments | « net/spdy/spdy_websocket_stream.h ('k') | net/spdy/spdy_websocket_stream_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "net/spdy/spdy_websocket_stream.h" 5 #include "net/spdy/spdy_websocket_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "net/spdy/spdy_framer.h" 12 #include "net/spdy/spdy_framer.h"
13 #include "net/spdy/spdy_protocol.h" 13 #include "net/spdy/spdy_protocol.h"
14 #include "net/spdy/spdy_session.h" 14 #include "net/spdy/spdy_session.h"
15 #include "net/spdy/spdy_stream.h" 15 #include "net/spdy/spdy_stream.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace net { 18 namespace net {
19 19
20 SpdyWebSocketStream::SpdyWebSocketStream( 20 SpdyWebSocketStream::SpdyWebSocketStream(
21 SpdySession* spdy_session, Delegate* delegate) 21 const base::WeakPtr<SpdySession>& spdy_session, Delegate* delegate)
22 : weak_ptr_factory_(this), 22 : weak_ptr_factory_(this),
23 spdy_session_(spdy_session), 23 spdy_session_(spdy_session),
24 pending_send_data_length_(0), 24 pending_send_data_length_(0),
25 delegate_(delegate) { 25 delegate_(delegate) {
26 DCHECK(spdy_session_.get()); 26 DCHECK(spdy_session_.get());
27 DCHECK(delegate_); 27 DCHECK(delegate_);
28 } 28 }
29 29
30 SpdyWebSocketStream::~SpdyWebSocketStream() { 30 SpdyWebSocketStream::~SpdyWebSocketStream() {
31 delegate_ = NULL; 31 delegate_ = NULL;
32 Close(); 32 Close();
33 } 33 }
34 34
35 int SpdyWebSocketStream::InitializeStream(const GURL& url, 35 int SpdyWebSocketStream::InitializeStream(const GURL& url,
36 RequestPriority request_priority, 36 RequestPriority request_priority,
37 const BoundNetLog& net_log) { 37 const BoundNetLog& net_log) {
38 if (spdy_session_->IsClosed()) 38 if (!spdy_session_)
39 return ERR_SOCKET_NOT_CONNECTED; 39 return ERR_SOCKET_NOT_CONNECTED;
40 40
41 int rv = stream_request_.StartRequest( 41 int rv = stream_request_.StartRequest(
42 SPDY_BIDIRECTIONAL_STREAM, spdy_session_, url, request_priority, net_log, 42 SPDY_BIDIRECTIONAL_STREAM, spdy_session_, url, request_priority, net_log,
43 base::Bind(&SpdyWebSocketStream::OnSpdyStreamCreated, 43 base::Bind(&SpdyWebSocketStream::OnSpdyStreamCreated,
44 weak_ptr_factory_.GetWeakPtr())); 44 weak_ptr_factory_.GetWeakPtr()));
45 45
46 if (rv == OK) { 46 if (rv == OK) {
47 stream_ = stream_request_.ReleaseStream(); 47 stream_ = stream_request_.ReleaseStream();
48 DCHECK(stream_.get()); 48 DCHECK(stream_.get());
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 if (result == OK) { 121 if (result == OK) {
122 stream_ = stream_request_.ReleaseStream(); 122 stream_ = stream_request_.ReleaseStream();
123 DCHECK(stream_.get()); 123 DCHECK(stream_.get());
124 stream_->SetDelegate(this); 124 stream_->SetDelegate(this);
125 } 125 }
126 DCHECK(delegate_); 126 DCHECK(delegate_);
127 delegate_->OnCreatedSpdyStream(result); 127 delegate_->OnCreatedSpdyStream(result);
128 } 128 }
129 129
130 } // namespace net 130 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_websocket_stream.h ('k') | net/spdy/spdy_websocket_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698