| 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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 } else { | 671 } else { |
| 672 flow_control_state_ = FLOW_CONTROL_NONE; | 672 flow_control_state_ = FLOW_CONTROL_NONE; |
| 673 } | 673 } |
| 674 | 674 |
| 675 buffered_spdy_framer_.reset( | 675 buffered_spdy_framer_.reset( |
| 676 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), | 676 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), |
| 677 enable_compression_)); | 677 enable_compression_)); |
| 678 buffered_spdy_framer_->set_visitor(this); | 678 buffered_spdy_framer_->set_visitor(this); |
| 679 buffered_spdy_framer_->set_debug_visitor(this); | 679 buffered_spdy_framer_->set_debug_visitor(this); |
| 680 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); | 680 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); |
| 681 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 682 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", | |
| 683 host_port_pair().Equals(HostPortPair::FromURL( | |
| 684 GURL(SPDY_PROXY_AUTH_ORIGIN)))); | |
| 685 #endif | |
| 686 | 681 |
| 687 net_log_.AddEvent( | 682 net_log_.AddEvent( |
| 688 NetLog::TYPE_SPDY_SESSION_INITIALIZED, | 683 NetLog::TYPE_SPDY_SESSION_INITIALIZED, |
| 689 connection_->socket()->NetLog().source().ToEventParametersCallback()); | 684 connection_->socket()->NetLog().source().ToEventParametersCallback()); |
| 690 | 685 |
| 691 DCHECK_EQ(availability_state_, STATE_AVAILABLE); | 686 DCHECK_EQ(availability_state_, STATE_AVAILABLE); |
| 692 connection_->AddHigherLayeredPool(this); | 687 connection_->AddHigherLayeredPool(this); |
| 693 if (enable_sending_initial_data_) | 688 if (enable_sending_initial_data_) |
| 694 SendInitialData(); | 689 SendInitialData(); |
| 695 pool_ = pool; | 690 pool_ = pool; |
| (...skipping 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3159 if (!queue->empty()) { | 3154 if (!queue->empty()) { |
| 3160 SpdyStreamId stream_id = queue->front(); | 3155 SpdyStreamId stream_id = queue->front(); |
| 3161 queue->pop_front(); | 3156 queue->pop_front(); |
| 3162 return stream_id; | 3157 return stream_id; |
| 3163 } | 3158 } |
| 3164 } | 3159 } |
| 3165 return 0; | 3160 return 0; |
| 3166 } | 3161 } |
| 3167 | 3162 |
| 3168 } // namespace net | 3163 } // namespace net |
| OLD | NEW |