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

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

Issue 12262004: Remove SpdyRstStreamControlFrame struct. Useful for SPDY 4 development. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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_protocol_test.cc ('k') | no next file » | 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_session.h" 5 #include "net/spdy/spdy_session.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 } 738 }
739 739
740 void SpdySession::ResetStream(SpdyStreamId stream_id, 740 void SpdySession::ResetStream(SpdyStreamId stream_id,
741 SpdyRstStreamStatus status, 741 SpdyRstStreamStatus status,
742 const std::string& description) { 742 const std::string& description) {
743 net_log().AddEvent( 743 net_log().AddEvent(
744 NetLog::TYPE_SPDY_SESSION_SEND_RST_STREAM, 744 NetLog::TYPE_SPDY_SESSION_SEND_RST_STREAM,
745 base::Bind(&NetLogSpdyRstCallback, stream_id, status, &description)); 745 base::Bind(&NetLogSpdyRstCallback, stream_id, status, &description));
746 746
747 DCHECK(buffered_spdy_framer_.get()); 747 DCHECK(buffered_spdy_framer_.get());
748 scoped_ptr<SpdyRstStreamControlFrame> rst_frame( 748 scoped_ptr<SpdyFrame> rst_frame(
749 buffered_spdy_framer_->CreateRstStream(stream_id, status)); 749 buffered_spdy_framer_->CreateRstStream(stream_id, status));
750 750
751 // Default to lowest priority unless we know otherwise. 751 // Default to lowest priority unless we know otherwise.
752 RequestPriority priority = net::IDLE; 752 RequestPriority priority = net::IDLE;
753 if (IsStreamActive(stream_id)) { 753 if (IsStreamActive(stream_id)) {
754 scoped_refptr<SpdyStream> stream = active_streams_[stream_id]; 754 scoped_refptr<SpdyStream> stream = active_streams_[stream_id];
755 priority = stream->priority(); 755 priority = stream->priority();
756 } 756 }
757 QueueFrame(rst_frame.release(), priority); 757 QueueFrame(rst_frame.release(), priority);
758 RecordProtocolErrorHistogram( 758 RecordProtocolErrorHistogram(
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1985 SSLClientSocket* SpdySession::GetSSLClientSocket() const { 1985 SSLClientSocket* SpdySession::GetSSLClientSocket() const {
1986 if (!is_secure_) 1986 if (!is_secure_)
1987 return NULL; 1987 return NULL;
1988 SSLClientSocket* ssl_socket = 1988 SSLClientSocket* ssl_socket =
1989 reinterpret_cast<SSLClientSocket*>(connection_->socket()); 1989 reinterpret_cast<SSLClientSocket*>(connection_->socket());
1990 DCHECK(ssl_socket); 1990 DCHECK(ssl_socket);
1991 return ssl_socket; 1991 return ssl_socket;
1992 } 1992 }
1993 1993
1994 } // namespace net 1994 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_protocol_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698