| OLD | NEW |
| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 } else { | 712 } else { |
| 713 flow_control_state_ = FLOW_CONTROL_NONE; | 713 flow_control_state_ = FLOW_CONTROL_NONE; |
| 714 } | 714 } |
| 715 | 715 |
| 716 buffered_spdy_framer_.reset( | 716 buffered_spdy_framer_.reset( |
| 717 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), | 717 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), |
| 718 enable_compression_)); | 718 enable_compression_)); |
| 719 buffered_spdy_framer_->set_visitor(this); | 719 buffered_spdy_framer_->set_visitor(this); |
| 720 buffered_spdy_framer_->set_debug_visitor(this); | 720 buffered_spdy_framer_->set_debug_visitor(this); |
| 721 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); | 721 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); |
| 722 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 723 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", | |
| 724 host_port_pair().Equals(HostPortPair::FromURL( | |
| 725 GURL(SPDY_PROXY_AUTH_ORIGIN)))); | |
| 726 #endif | |
| 727 | 722 |
| 728 net_log_.AddEvent( | 723 net_log_.AddEvent( |
| 729 NetLog::TYPE_SPDY_SESSION_INITIALIZED, | 724 NetLog::TYPE_SPDY_SESSION_INITIALIZED, |
| 730 connection_->socket()->NetLog().source().ToEventParametersCallback()); | 725 connection_->socket()->NetLog().source().ToEventParametersCallback()); |
| 731 | 726 |
| 732 DCHECK_EQ(availability_state_, STATE_AVAILABLE); | 727 DCHECK_EQ(availability_state_, STATE_AVAILABLE); |
| 733 connection_->AddHigherLayeredPool(this); | 728 connection_->AddHigherLayeredPool(this); |
| 734 if (enable_sending_initial_data_) | 729 if (enable_sending_initial_data_) |
| 735 SendInitialData(); | 730 SendInitialData(); |
| 736 pool_ = pool; | 731 pool_ = pool; |
| (...skipping 2470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3207 if (!queue->empty()) { | 3202 if (!queue->empty()) { |
| 3208 SpdyStreamId stream_id = queue->front(); | 3203 SpdyStreamId stream_id = queue->front(); |
| 3209 queue->pop_front(); | 3204 queue->pop_front(); |
| 3210 return stream_id; | 3205 return stream_id; |
| 3211 } | 3206 } |
| 3212 } | 3207 } |
| 3213 return 0; | 3208 return 0; |
| 3214 } | 3209 } |
| 3215 | 3210 |
| 3216 } // namespace net | 3211 } // namespace net |
| OLD | NEW |