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

Side by Side Diff: net/socket/ssl_client_socket_mac.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_mac.h ('k') | net/socket/ssl_client_socket_nss.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 #include "net/socket/ssl_client_socket_mac.h" 5 #include "net/socket/ssl_client_socket_mac.h"
6 6
7 #include <CoreServices/CoreServices.h> 7 #include <CoreServices/CoreServices.h>
8 #include <netdb.h> 8 #include <netdb.h>
9 #include <sys/socket.h> 9 #include <sys/socket.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 } 651 }
652 652
653 bool SSLClientSocketMac::UsingTCPFastOpen() const { 653 bool SSLClientSocketMac::UsingTCPFastOpen() const {
654 if (transport_.get() && transport_->socket()) { 654 if (transport_.get() && transport_->socket()) {
655 return transport_->socket()->UsingTCPFastOpen(); 655 return transport_->socket()->UsingTCPFastOpen();
656 } 656 }
657 NOTREACHED(); 657 NOTREACHED();
658 return false; 658 return false;
659 } 659 }
660 660
661 int64 SSLClientSocketMac::NumBytesRead() const {
662 if (transport_.get() && transport_->socket()) {
663 return transport_->socket()->NumBytesRead();
664 }
665 NOTREACHED();
666 return -1;
667 }
668
669 base::TimeDelta SSLClientSocketMac::GetConnectTimeMicros() const {
670 if (transport_.get() && transport_->socket()) {
671 return transport_->socket()->GetConnectTimeMicros();
672 }
673 NOTREACHED();
674 return base::TimeDelta::FromMicroseconds(-1);
675 }
676
677 int SSLClientSocketMac::Read(IOBuffer* buf, int buf_len, 661 int SSLClientSocketMac::Read(IOBuffer* buf, int buf_len,
678 CompletionCallback* callback) { 662 CompletionCallback* callback) {
679 DCHECK(completed_handshake()); 663 DCHECK(completed_handshake());
680 DCHECK(!user_read_callback_); 664 DCHECK(!user_read_callback_);
681 DCHECK(!user_read_buf_); 665 DCHECK(!user_read_buf_);
682 666
683 user_read_buf_ = buf; 667 user_read_buf_ = buf;
684 user_read_buf_len_ = buf_len; 668 user_read_buf_len_ = buf_len;
685 669
686 int rv = DoPayloadRead(); 670 int rv = DoPayloadRead();
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 if (rv < 0 && rv != ERR_IO_PENDING) { 1393 if (rv < 0 && rv != ERR_IO_PENDING) {
1410 us->write_io_buf_ = NULL; 1394 us->write_io_buf_ = NULL;
1411 return OSStatusFromNetError(rv); 1395 return OSStatusFromNetError(rv);
1412 } 1396 }
1413 1397
1414 // always lie to our caller 1398 // always lie to our caller
1415 return noErr; 1399 return noErr;
1416 } 1400 }
1417 1401
1418 } // namespace net 1402 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_mac.h ('k') | net/socket/ssl_client_socket_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698