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

Unified Diff: net/quic/quic_stream_factory.cc

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « net/proxy/proxy_resolver_v8.cc ('k') | net/server/web_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 738326a4d7d9440d2ec9e23cfd7557ee1a418ec1..ecd338aaa80e8f9993776d42bfd2efb1ef99698b 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -292,13 +292,17 @@ int QuicStreamFactory::Job::DoLoop(int rv) {
}
void QuicStreamFactory::Job::OnIOComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 QuicStreamFactory::Job::OnIOComplete"));
+ "422516 QuicStreamFactory::Job::OnIOComplete1"));
rv = DoLoop(rv);
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::OnIOComplete2"));
+
if (rv != ERR_IO_PENDING && !callback_.is_null()) {
callback_.Run(rv);
}
@@ -647,6 +651,11 @@ bool QuicStreamFactory::OnResolution(
void QuicStreamFactory::OnJobComplete(Job* job, int rv) {
if (rv == OK) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::OnJobComplete1"));
+
if (!always_require_handshake_confirmation_)
set_require_confirmation(false);
@@ -658,6 +667,12 @@ void QuicStreamFactory::OnJobComplete(Job* job, int rv) {
(*it)->net_log()));
}
}
+
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::OnJobComplete2"));
+
while (!job_requests_map_[job].empty()) {
RequestSet::iterator it = job_requests_map_[job].begin();
QuicStreamRequest* request = *it;
@@ -668,6 +683,12 @@ void QuicStreamFactory::OnJobComplete(Job* job, int rv) {
// profile which can not be deleted via callbacks.
request->OnRequestComplete(rv);
}
+
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile3(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::OnJobComplete3"));
+
active_jobs_.erase(job->server_id());
job_requests_map_.erase(job);
delete job;
« no previous file with comments | « net/proxy/proxy_resolver_v8.cc ('k') | net/server/web_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698