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

Side by Side Diff: Source/core/page/DOMWindowTimers.cpp

Issue 19494002: Distinguish actions registered with setTimeout() and setInterval(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase again. 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 unified diff | Download patch
« no previous file with comments | « Source/core/page/DOMTimer.cpp ('k') | 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) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 4 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 24 matching lines...) Expand all
35 35
36 #include "core/dom/EventTarget.h" 36 #include "core/dom/EventTarget.h"
37 #include "core/page/DOMTimer.h" 37 #include "core/page/DOMTimer.h"
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 namespace DOMWindowTimers { 41 namespace DOMWindowTimers {
42 42
43 int setTimeout(EventTarget* eventTarget, PassOwnPtr<ScheduledAction> action, int timeout) 43 int setTimeout(EventTarget* eventTarget, PassOwnPtr<ScheduledAction> action, int timeout)
44 { 44 {
45 return DOMTimer::install(eventTarget->scriptExecutionContext(), action, time out, true); 45 return DOMTimer::install(eventTarget->scriptExecutionContext(), DOMTimer::Ti meoutType, action, timeout);
46 } 46 }
47 47
48 int setInterval(EventTarget* eventTarget, PassOwnPtr<ScheduledAction> action, in t timeout) 48 int setInterval(EventTarget* eventTarget, PassOwnPtr<ScheduledAction> action, in t timeout)
49 { 49 {
50 return DOMTimer::install(eventTarget->scriptExecutionContext(), action, time out, false); 50 return DOMTimer::install(eventTarget->scriptExecutionContext(), DOMTimer::In tervalType, action, timeout);
51 } 51 }
52 52
53 void clearTimeout(EventTarget* eventTarget, int timeoutID) 53 void clearTimeout(EventTarget* eventTarget, int timeoutID)
54 { 54 {
55 if (ScriptExecutionContext* context = eventTarget->scriptExecutionContext()) 55 if (ScriptExecutionContext* context = eventTarget->scriptExecutionContext())
56 DOMTimer::removeByID(context, timeoutID); 56 DOMTimer::removeByIDIfTypeMatches(context, DOMTimer::TimeoutType, timeou tID);
57 } 57 }
58 58
59 void clearInterval(EventTarget* eventTarget, int timeoutID) 59 void clearInterval(EventTarget* eventTarget, int timeoutID)
60 { 60 {
61 if (ScriptExecutionContext* context = eventTarget->scriptExecutionContext()) 61 if (ScriptExecutionContext* context = eventTarget->scriptExecutionContext())
62 DOMTimer::removeByID(context, timeoutID); 62 DOMTimer::removeByIDIfTypeMatches(context, DOMTimer::IntervalType, timeo utID);
63 } 63 }
64 64
65 } // namespace DOMWindowTimers 65 } // namespace DOMWindowTimers
66 66
67 } // namespace WebCore 67 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/DOMTimer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698