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

Side by Side Diff: third_party/WebKit/Source/core/loader/PingLoader.cpp

Issue 2083023002: Stop PingLoader's cancellation timer early. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 if (m_loader) 157 if (m_loader)
158 m_loader->cancel(); 158 m_loader->cancel();
159 } 159 }
160 160
161 void PingLoader::dispose() 161 void PingLoader::dispose()
162 { 162 {
163 if (m_loader) { 163 if (m_loader) {
164 m_loader->cancel(); 164 m_loader->cancel();
165 m_loader = nullptr; 165 m_loader = nullptr;
166 } 166 }
167 m_timeout.stop();
167 m_keepAlive.clear(); 168 m_keepAlive.clear();
168 } 169 }
169 170
170 void PingLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& respons e) 171 void PingLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& respons e)
171 { 172 {
172 if (LocalFrame* frame = this->frame()) { 173 if (LocalFrame* frame = this->frame()) {
173 TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_ SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true)) ; 174 TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_ SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true)) ;
174 const ResourceResponse& resourceResponse = response.toResourceResponse() ; 175 const ResourceResponse& resourceResponse = response.toResourceResponse() ;
175 InspectorInstrumentation::didReceiveResourceResponse(frame, m_identifier , 0, resourceResponse, 0); 176 InspectorInstrumentation::didReceiveResourceResponse(frame, m_identifier , 0, resourceResponse, 0);
176 didFailLoading(frame); 177 didFailLoading(frame);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 InspectorInstrumentation::didFailLoading(frame, m_identifier, ResourceError: :cancelledError(m_url)); 220 InspectorInstrumentation::didFailLoading(frame, m_identifier, ResourceError: :cancelledError(m_url));
220 frame->console().didFailLoading(m_identifier, ResourceError::cancelledError( m_url)); 221 frame->console().didFailLoading(m_identifier, ResourceError::cancelledError( m_url));
221 } 222 }
222 223
223 DEFINE_TRACE(PingLoader) 224 DEFINE_TRACE(PingLoader)
224 { 225 {
225 LocalFrameLifecycleObserver::trace(visitor); 226 LocalFrameLifecycleObserver::trace(visitor);
226 } 227 }
227 228
228 } // namespace blink 229 } // namespace blink
OLDNEW
« 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