Chromium Code Reviews| 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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 668 } else { | 668 } else { |
| 669 flow_control_state_ = FLOW_CONTROL_NONE; | 669 flow_control_state_ = FLOW_CONTROL_NONE; |
| 670 } | 670 } |
| 671 | 671 |
| 672 buffered_spdy_framer_.reset( | 672 buffered_spdy_framer_.reset( |
| 673 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), | 673 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), |
| 674 enable_compression_)); | 674 enable_compression_)); |
| 675 buffered_spdy_framer_->set_visitor(this); | 675 buffered_spdy_framer_->set_visitor(this); |
| 676 buffered_spdy_framer_->set_debug_visitor(this); | 676 buffered_spdy_framer_->set_debug_visitor(this); |
| 677 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); | 677 UMA_HISTOGRAM_ENUMERATION("Net.SpdyVersion", protocol_, kProtoMaximumVersion); |
| 678 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 679 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", | 678 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", |
|
bengr
2014/07/11 20:42:54
I don't think we need this UMA anymore. Ask around
| |
| 680 host_port_pair().Equals(HostPortPair::FromURL( | 679 host_port_pair().Equals(HostPortPair::FromURL( |
| 681 GURL(SPDY_PROXY_AUTH_ORIGIN)))); | 680 GURL(SPDY_PROXY_AUTH_ORIGIN)))); |
| 682 #endif | |
| 683 | 681 |
| 684 net_log_.AddEvent( | 682 net_log_.AddEvent( |
| 685 NetLog::TYPE_SPDY_SESSION_INITIALIZED, | 683 NetLog::TYPE_SPDY_SESSION_INITIALIZED, |
| 686 connection_->socket()->NetLog().source().ToEventParametersCallback()); | 684 connection_->socket()->NetLog().source().ToEventParametersCallback()); |
| 687 | 685 |
| 688 DCHECK_EQ(availability_state_, STATE_AVAILABLE); | 686 DCHECK_EQ(availability_state_, STATE_AVAILABLE); |
| 689 connection_->AddHigherLayeredPool(this); | 687 connection_->AddHigherLayeredPool(this); |
| 690 if (enable_sending_initial_data_) | 688 if (enable_sending_initial_data_) |
| 691 SendInitialData(); | 689 SendInitialData(); |
| 692 pool_ = pool; | 690 pool_ = pool; |
| (...skipping 2440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3133 if (!queue->empty()) { | 3131 if (!queue->empty()) { |
| 3134 SpdyStreamId stream_id = queue->front(); | 3132 SpdyStreamId stream_id = queue->front(); |
| 3135 queue->pop_front(); | 3133 queue->pop_front(); |
| 3136 return stream_id; | 3134 return stream_id; |
| 3137 } | 3135 } |
| 3138 } | 3136 } |
| 3139 return 0; | 3137 return 0; |
| 3140 } | 3138 } |
| 3141 | 3139 |
| 3142 } // namespace net | 3140 } // namespace net |
| OLD | NEW |