| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/linked_ptr.h" | 8 #include "base/linked_ptr.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 static base::StatsCounter used_push_streams("spdy.claimed_push_streams"); | 930 static base::StatsCounter used_push_streams("spdy.claimed_push_streams"); |
| 931 | 931 |
| 932 PushedStreamMap::iterator it = unclaimed_pushed_streams_.find(path); | 932 PushedStreamMap::iterator it = unclaimed_pushed_streams_.find(path); |
| 933 if (it != unclaimed_pushed_streams_.end()) { | 933 if (it != unclaimed_pushed_streams_.end()) { |
| 934 net_log_.AddEvent(NetLog::TYPE_SPDY_STREAM_ADOPTED_PUSH_STREAM, NULL); | 934 net_log_.AddEvent(NetLog::TYPE_SPDY_STREAM_ADOPTED_PUSH_STREAM, NULL); |
| 935 scoped_refptr<SpdyStream> stream = it->second; | 935 scoped_refptr<SpdyStream> stream = it->second; |
| 936 unclaimed_pushed_streams_.erase(it); | 936 unclaimed_pushed_streams_.erase(it); |
| 937 used_push_streams.Increment(); | 937 used_push_streams.Increment(); |
| 938 return stream; | 938 return stream; |
| 939 } | 939 } |
| 940 else { | 940 return NULL; |
| 941 return NULL; | |
| 942 } | |
| 943 } | 941 } |
| 944 | 942 |
| 945 bool SpdySession::GetSSLInfo(SSLInfo* ssl_info, bool* was_npn_negotiated) { | 943 bool SpdySession::GetSSLInfo(SSLInfo* ssl_info, bool* was_npn_negotiated) { |
| 946 if (is_secure_) { | 944 if (is_secure_) { |
| 947 SSLClientSocket* ssl_socket = | 945 SSLClientSocket* ssl_socket = |
| 948 reinterpret_cast<SSLClientSocket*>(connection_->socket()); | 946 reinterpret_cast<SSLClientSocket*>(connection_->socket()); |
| 949 ssl_socket->GetSSLInfo(ssl_info); | 947 ssl_socket->GetSSLInfo(ssl_info); |
| 950 *was_npn_negotiated = ssl_socket->was_npn_negotiated(); | 948 *was_npn_negotiated = ssl_socket->was_npn_negotiated(); |
| 951 return true; | 949 return true; |
| 952 } | 950 } |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1453 if (it == pending_callback_map_.end()) | 1451 if (it == pending_callback_map_.end()) |
| 1454 return; | 1452 return; |
| 1455 | 1453 |
| 1456 CompletionCallback* callback = it->second.callback; | 1454 CompletionCallback* callback = it->second.callback; |
| 1457 int result = it->second.result; | 1455 int result = it->second.result; |
| 1458 pending_callback_map_.erase(it); | 1456 pending_callback_map_.erase(it); |
| 1459 callback->Run(result); | 1457 callback->Run(result); |
| 1460 } | 1458 } |
| 1461 | 1459 |
| 1462 } // namespace net | 1460 } // namespace net |
| OLD | NEW |