Source/core/dom/ScriptExecutionContext.h - Issue 19494002: Distinguish actions registered with setTimeout() and setInterval().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/dom/ScriptExecutionContext.h

Issue 19494002: Distinguish actions registered with setTimeout() and setInterval(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix test, and add a new test. Created 7 years, 5 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

« LayoutTests/fast/dom/Window/set-and-clear-Timeout-and-Interval.html ('K') | « Source/bindings/v8/custom/V8WorkerGlobalScopeCustom.cpp ('k') | Source/core/dom/ScriptExecutionContext.cpp » ('j') | Source/core/page/DOMTimer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/ScriptExecutionContext.h

diff --git a/Source/core/dom/ScriptExecutionContext.h b/Source/core/dom/ScriptExecutionContext.h

index 020aa205499fc32098c786dc1e74bf813df038d2..0d9884478476795935e817c1f7a9507361045aed 100644

--- a/Source/core/dom/ScriptExecutionContext.h

+++ b/Source/core/dom/ScriptExecutionContext.h

@@ -174,8 +174,8 @@ private:

virtual PassOwnPtr<ContextLifecycleNotifier> createLifecycleNotifier();

// Implementation details for DOMTimer. No other classes should call these functions.

- int installNewTimeout(PassOwnPtr<ScheduledAction>, int timeout, bool singleShot);

- void removeTimeoutByID(int timeoutID); // This makes underlying DOMTimer instance destructed.

+ int installNewTimeout(DOMTimer::TimerType, PassOwnPtr<ScheduledAction>, int timeout);

+ void removeTimeoutByIDIfTypeMatches(DOMTimer::TimerType, int timeoutID); // This makes underlying DOMTimer instance destructed.

HashSet<MessagePort*> m_messagePorts;