OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/quic/quic_stream_factory.h" | 5 #include "net/quic/quic_stream_factory.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
292 } | 292 } |
293 | 293 |
294 void QuicStreamFactory::Job::OnIOComplete(int rv) { | 294 void QuicStreamFactory::Job::OnIOComplete(int rv) { |
295 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed. | 295 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed. |
296 tracked_objects::ScopedTracker tracking_profile( | 296 tracked_objects::ScopedTracker tracking_profile( |
297 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 297 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
298 "436634 QuicStreamFactory::Job::OnIOComplete")); | 298 "436634 QuicStreamFactory::Job::OnIOComplete")); |
299 | 299 |
300 rv = DoLoop(rv); | 300 rv = DoLoop(rv); |
301 | 301 |
302 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed. | |
303 tracked_objects::ScopedTracker tracking_profile1( | |
304 FROM_HERE_WITH_EXPLICIT_FUNCTION( | |
305 "436634 QuicStreamFactory::Job::OnIOComplete1")); | |
mmenke
2014/12/11 20:00:38
This is done in the other CL, using a different na
vadimt
2014/12/11 20:22:26
Done.
| |
306 | |
302 if (rv != ERR_IO_PENDING && !callback_.is_null()) { | 307 if (rv != ERR_IO_PENDING && !callback_.is_null()) { |
303 callback_.Run(rv); | 308 callback_.Run(rv); |
304 } | 309 } |
305 } | 310 } |
306 | 311 |
307 void QuicStreamFactory::Job::CancelWaitForDataReadyCallback() { | 312 void QuicStreamFactory::Job::CancelWaitForDataReadyCallback() { |
308 // If we are waiting for WaitForDataReadyCallback, then cancel the callback. | 313 // If we are waiting for WaitForDataReadyCallback, then cancel the callback. |
309 if (io_state_ != STATE_LOAD_SERVER_INFO_COMPLETE) | 314 if (io_state_ != STATE_LOAD_SERVER_INFO_COMPLETE) |
310 return; | 315 return; |
311 server_info_->CancelWaitForDataReadyCallback(); | 316 server_info_->CancelWaitForDataReadyCallback(); |
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1079 http_server_properties_->ClearAlternateProtocol(server); | 1084 http_server_properties_->ClearAlternateProtocol(server); |
1080 http_server_properties_->SetAlternateProtocol( | 1085 http_server_properties_->SetAlternateProtocol( |
1081 server, alternate.port, alternate.protocol, 1); | 1086 server, alternate.port, alternate.protocol, 1); |
1082 DCHECK_EQ(QUIC, | 1087 DCHECK_EQ(QUIC, |
1083 http_server_properties_->GetAlternateProtocol(server).protocol); | 1088 http_server_properties_->GetAlternateProtocol(server).protocol); |
1084 DCHECK(http_server_properties_->WasAlternateProtocolRecentlyBroken( | 1089 DCHECK(http_server_properties_->WasAlternateProtocolRecentlyBroken( |
1085 server)); | 1090 server)); |
1086 } | 1091 } |
1087 | 1092 |
1088 } // namespace net | 1093 } // namespace net |
OLD | NEW |