| Index: Source/core/frame/DOMTimer.cpp
|
| diff --git a/Source/core/frame/DOMTimer.cpp b/Source/core/frame/DOMTimer.cpp
|
| index 4b4e09fac7c3cddae2bf07c55fb24fa81dcf7126..1de9c69a45f3c0966905467980757265acef216e 100644
|
| --- a/Source/core/frame/DOMTimer.cpp
|
| +++ b/Source/core/frame/DOMTimer.cpp
|
| @@ -66,7 +66,7 @@ double DOMTimer::visiblePageAlignmentInterval()
|
| return 0;
|
| }
|
|
|
| -int DOMTimer::install(ExecutionContext* context, PassOwnPtr<ScheduledAction> action, int timeout, bool singleShot)
|
| +int DOMTimer::install(ExecutionContext* context, PassOwnPtrWillBeRawPtr<ScheduledAction> action, int timeout, bool singleShot)
|
| {
|
| int timeoutID = context->timers()->installNewTimeout(context, action, timeout, singleShot);
|
| TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerInstall", "data", InspectorTimerInstallEvent::data(context, timeoutID, timeout, singleShot));
|
| @@ -85,7 +85,7 @@ void DOMTimer::removeByID(ExecutionContext* context, int timeoutID)
|
| InspectorInstrumentation::didRemoveTimer(context, timeoutID);
|
| }
|
|
|
| -DOMTimer::DOMTimer(ExecutionContext* context, PassOwnPtr<ScheduledAction> action, int interval, bool singleShot, int timeoutID)
|
| +DOMTimer::DOMTimer(ExecutionContext* context, PassOwnPtrWillBeRawPtr<ScheduledAction> action, int interval, bool singleShot, int timeoutID)
|
| : SuspendableTimer(context)
|
| , m_timeoutID(timeoutID)
|
| , m_nestingLevel(context->timers()->timerNestingLevel() + 1)
|
| @@ -157,7 +157,7 @@ void DOMTimer::fired()
|
|
|
| // Unregister the timer from ExecutionContext before executing the action
|
| // for one-shot timers.
|
| - OwnPtr<ScheduledAction> action = m_action.release();
|
| + OwnPtrWillBeRawPtr<ScheduledAction> action = m_action.release();
|
| context->timers()->removeTimeoutByID(m_timeoutID);
|
|
|
| action->execute(context);
|
| @@ -217,6 +217,7 @@ double DOMTimer::alignedFireTime(double fireTime) const
|
|
|
| void DOMTimer::trace(Visitor* visitor)
|
| {
|
| + visitor->trace(m_action);
|
| SuspendableTimer::trace(visitor);
|
| }
|
|
|
|
|