Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Side by Side Diff: net/socket/ssl_client_socket_nss.cc

Issue 7255002: Revert 90373 - Warmth of a connection (cwnd) is estimated by the amount of data written to the so... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 } 707 }
708 708
709 bool SSLClientSocketNSS::UsingTCPFastOpen() const { 709 bool SSLClientSocketNSS::UsingTCPFastOpen() const {
710 if (transport_.get() && transport_->socket()) { 710 if (transport_.get() && transport_->socket()) {
711 return transport_->socket()->UsingTCPFastOpen(); 711 return transport_->socket()->UsingTCPFastOpen();
712 } 712 }
713 NOTREACHED(); 713 NOTREACHED();
714 return false; 714 return false;
715 } 715 }
716 716
717 int64 SSLClientSocketNSS::NumBytesRead() const {
718 if (transport_.get() && transport_->socket()) {
719 return transport_->socket()->NumBytesRead();
720 }
721 NOTREACHED();
722 return -1;
723 }
724
725 base::TimeDelta SSLClientSocketNSS::GetConnectTimeMicros() const {
726 if (transport_.get() && transport_->socket()) {
727 return transport_->socket()->GetConnectTimeMicros();
728 }
729 NOTREACHED();
730 return base::TimeDelta::FromMicroseconds(-1);
731 }
732
733 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len, 717 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
734 CompletionCallback* callback) { 718 CompletionCallback* callback) {
735 EnterFunction(buf_len); 719 EnterFunction(buf_len);
736 DCHECK(completed_handshake_); 720 DCHECK(completed_handshake_);
737 DCHECK(next_handshake_state_ == STATE_NONE); 721 DCHECK(next_handshake_state_ == STATE_NONE);
738 DCHECK(!user_read_callback_); 722 DCHECK(!user_read_callback_);
739 DCHECK(!user_connect_callback_); 723 DCHECK(!user_connect_callback_);
740 DCHECK(!user_read_buf_); 724 DCHECK(!user_read_buf_);
741 DCHECK(nss_bufs_); 725 DCHECK(nss_bufs_);
742 726
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after
2245 valid_thread_id_ = base::PlatformThread::CurrentId(); 2229 valid_thread_id_ = base::PlatformThread::CurrentId();
2246 } 2230 }
2247 2231
2248 bool SSLClientSocketNSS::CalledOnValidThread() const { 2232 bool SSLClientSocketNSS::CalledOnValidThread() const {
2249 EnsureThreadIdAssigned(); 2233 EnsureThreadIdAssigned();
2250 base::AutoLock auto_lock(lock_); 2234 base::AutoLock auto_lock(lock_);
2251 return valid_thread_id_ == base::PlatformThread::CurrentId(); 2235 return valid_thread_id_ == base::PlatformThread::CurrentId();
2252 } 2236 }
2253 2237
2254 } // namespace net 2238 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698