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

Unified Diff: third_party/WebKit/Source/core/loader/PingLoader.cpp

Issue 2652253003: Revert of Use TaskRunnerTimer in PingLoader (Closed)
Patch Set: Created 3 years, 11 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 | « third_party/WebKit/Source/core/loader/PingLoader.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/PingLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/PingLoader.cpp b/third_party/WebKit/Source/core/loader/PingLoader.cpp
index f7b637a8133635c88ca5862e67a4735a977a1518..bef3da748378139c565f42258f31949b48c8d4f3 100644
--- a/third_party/WebKit/Source/core/loader/PingLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/PingLoader.cpp
@@ -35,7 +35,6 @@
#include "core/dom/DOMArrayBufferView.h"
#include "core/dom/Document.h"
#include "core/dom/SecurityContext.h"
-#include "core/dom/TaskRunnerHelper.h"
#include "core/fetch/CrossOriginAccessControl.h"
#include "core/fetch/FetchContext.h"
#include "core/fetch/FetchInitiatorTypeNames.h"
@@ -54,7 +53,6 @@
#include "core/loader/FrameLoaderClient.h"
#include "core/loader/MixedContentChecker.h"
#include "core/page/Page.h"
-#include "platform/Timer.h"
#include "platform/WebFrameScheduler.h"
#include "platform/exported/WrappedResourceRequest.h"
#include "platform/exported/WrappedResourceResponse.h"
@@ -220,7 +218,7 @@ class PingLoaderImpl : public GarbageCollectedFinalized<PingLoaderImpl>,
void didFailLoading(LocalFrame*);
std::unique_ptr<WebURLLoader> m_loader;
- TaskRunnerTimer<PingLoaderImpl> m_timeout;
+ Timer<PingLoaderImpl> m_timeout;
String m_url;
unsigned long m_identifier;
SelfKeepAlive<PingLoaderImpl> m_keepAlive;
@@ -238,9 +236,7 @@ PingLoaderImpl::PingLoaderImpl(LocalFrame* frame,
StoredCredentials credentialsAllowed,
bool isBeacon)
: ContextClient(frame),
- m_timeout(TaskRunnerHelper::get(TaskType::Networking, frame),
- this,
- &PingLoaderImpl::timeout),
+ m_timeout(this, &PingLoaderImpl::timeout),
m_url(request.url()),
m_identifier(createUniqueIdentifier()),
m_keepAlive(this),
« no previous file with comments | « third_party/WebKit/Source/core/loader/PingLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698