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

Unified Diff: third_party/WebKit/Source/core/frame/DOMTimer.cpp

Issue 2746333002: DevTools: move recurring flag into AsyncTask, control cancelation from embedder only. (Closed)
Patch Set: using _END now Created 3 years, 9 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
Index: third_party/WebKit/Source/core/frame/DOMTimer.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMTimer.cpp b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
index fb0116861a5bd74d5d912f8a9e2d4be42ca4655b..a57062c1a6f9447a233d8435e7e7cc9987bb1528 100644
--- a/third_party/WebKit/Source/core/frame/DOMTimer.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
@@ -104,7 +104,7 @@ DOMTimer::DOMTimer(ExecutionContext* context,
InspectorTimerInstallEvent::data(context, timeoutID,
interval, singleShot));
probe::asyncTaskScheduledBreakable(
- context, singleShot ? "setTimeout" : "setInterval", this, !singleShot);
+ context, singleShot ? "setTimeout" : "setInterval", this);
}
DOMTimer::~DOMTimer() {
@@ -145,7 +145,8 @@ void DOMTimer::fired() {
probe::UserCallback probe(context,
repeatInterval() ? "setInterval" : "setTimeout",
AtomicString(), true);
- probe::AsyncTask asyncTask(context, this);
+ probe::AsyncTask asyncTask(context, this,
+ repeatInterval() ? "fired" : nullptr);
// Simple case for non-one-shot timers.
if (isActive()) {

Powered by Google App Engine
This is Rietveld 408576698