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

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 687843002: Adding instrumentation to locate the source of jankiness. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index d336350f68d44a15502cd25705459bbdf3192c58..9f58551dbf78ad4667c72088ba32b0d1fb4d92d9 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1631,6 +1631,11 @@ void SSLClientSocketNSS::Core::HandshakeCallback(
}
void SSLClientSocketNSS::Core::HandshakeSucceeded() {
+ // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed.
+ tracked_objects::ScopedProfile tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "424386 SSLClientSocketNSS::Core::HandshakeSucceeded"));
+
DCHECK(OnNSSTaskRunner());
PRBool last_handshake_resumed;
@@ -1657,6 +1662,11 @@ void SSLClientSocketNSS::Core::HandshakeSucceeded() {
}
int SSLClientSocketNSS::Core::HandleNSSError(PRErrorCode nss_error) {
+ // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed.
+ tracked_objects::ScopedProfile tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "424386 SSLClientSocketNSS::Core::HandleNSSError"));
+
DCHECK(OnNSSTaskRunner());
int net_error = MapNSSClientError(nss_error);
@@ -1804,6 +1814,11 @@ int SSLClientSocketNSS::Core::DoHandshake() {
int net_error = OK;
SECStatus rv = SSL_ForceHandshake(nss_fd_);
+ // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed.
+ tracked_objects::ScopedProfile tracking_profile1(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "424386 SSLClientSocketNSS::Core::DoHandshake 1"));
+
// Note: this function may be called multiple times during the handshake, so
// even though channel id and client auth are separate else cases, they can
// both be used during a single SSL handshake.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698