Source/core/page/DOMWindow.cpp - 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/page/DOMWindow.cpp

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

Patch Set: 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/core/page/DOMTimer.cpp ('k') | Source/core/workers/WorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/DOMWindow.cpp

diff --git a/Source/core/page/DOMWindow.cpp b/Source/core/page/DOMWindow.cpp

index 91af94846ad7a7891bc4672663ff139adfca6788..3a5121c1bdd8ac737a6460e5c0fe54d8c3be4991 100644

--- a/Source/core/page/DOMWindow.cpp

+++ b/Source/core/page/DOMWindow.cpp

@@ -1400,13 +1400,13 @@ void DOMWindow::resizeTo(float width, float height) const

void DOMWindow::clearTimeout(int timeoutID)

{

if (ScriptExecutionContext* context = scriptExecutionContext())

- DOMTimer::removeByID(context, timeoutID);

+ DOMTimer::removeByIDIfTypeMatches(context, DOMTimer::TimerTypeTimeout, timeoutID);

}

void DOMWindow::clearInterval(int timeoutID)

{

if (ScriptExecutionContext* context = scriptExecutionContext())

- DOMTimer::removeByID(context, timeoutID);

+ DOMTimer::removeByIDIfTypeMatches(context, DOMTimer::TimerTypeInterval, timeoutID);

}

static LayoutSize size(HTMLImageElement* image)