| 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 flow_control_state_ = FLOW_CONTROL_STREAM; | 712 flow_control_state_ = FLOW_CONTROL_STREAM; |
| 713 } else { | 713 } else { |
| 714 flow_control_state_ = FLOW_CONTROL_NONE; | 714 flow_control_state_ = FLOW_CONTROL_NONE; |
| 715 } | 715 } |
| 716 | 716 |
| 717 buffered_spdy_framer_.reset( | 717 buffered_spdy_framer_.reset( |
| 718 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), | 718 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), |
| 719 enable_compression_)); | 719 enable_compression_)); |
| 720 buffered_spdy_framer_->set_visitor(this); | 720 buffered_spdy_framer_->set_visitor(this); |
| 721 buffered_spdy_framer_->set_debug_visitor(this); | 721 buffered_spdy_framer_->set_debug_visitor(this); |
| 722 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); | 722 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion2", |
| 723 SpdyProtoPermanentValue(protocol_), |
| 724 spdyProtoPermanentValueBoundary); |
| 723 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 725 #if defined(SPDY_PROXY_AUTH_ORIGIN) |
| 724 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", | 726 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", |
| 725 host_port_pair().Equals(HostPortPair::FromURL( | 727 host_port_pair().Equals(HostPortPair::FromURL( |
| 726 GURL(SPDY_PROXY_AUTH_ORIGIN)))); | 728 GURL(SPDY_PROXY_AUTH_ORIGIN)))); |
| 727 #endif | 729 #endif |
| 728 | 730 |
| 729 net_log_.AddEvent( | 731 net_log_.AddEvent( |
| 730 NetLog::TYPE_SPDY_SESSION_INITIALIZED, | 732 NetLog::TYPE_SPDY_SESSION_INITIALIZED, |
| 731 connection_->socket()->NetLog().source().ToEventParametersCallback()); | 733 connection_->socket()->NetLog().source().ToEventParametersCallback()); |
| 732 | 734 |
| (...skipping 2498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3231 if (!queue->empty()) { | 3233 if (!queue->empty()) { |
| 3232 SpdyStreamId stream_id = queue->front(); | 3234 SpdyStreamId stream_id = queue->front(); |
| 3233 queue->pop_front(); | 3235 queue->pop_front(); |
| 3234 return stream_id; | 3236 return stream_id; |
| 3235 } | 3237 } |
| 3236 } | 3238 } |
| 3237 return 0; | 3239 return 0; |
| 3238 } | 3240 } |
| 3239 | 3241 |
| 3240 } // namespace net | 3242 } // namespace net |
| OLD | NEW |