| Index: Source/core/frame/DOMTimer.cpp
|
| diff --git a/Source/core/frame/DOMTimer.cpp b/Source/core/frame/DOMTimer.cpp
|
| index 0d3af80cda998f6c3577f0684172e31768b8487d..4a7dc908369755c5ed95b10aa7cdfad3d2f92015 100644
|
| --- a/Source/core/frame/DOMTimer.cpp
|
| +++ b/Source/core/frame/DOMTimer.cpp
|
| @@ -68,7 +68,7 @@ double DOMTimer::visiblePageAlignmentInterval()
|
| return 0;
|
| }
|
|
|
| -int DOMTimer::install(ExecutionContext* context, PassOwnPtr<ScheduledAction> action, int timeout, bool singleShot)
|
| +int DOMTimer::install(ExecutionContext* context, PassOwnPtr<ScheduledActionBase> action, int timeout, bool singleShot)
|
| {
|
| int timeoutID = context->installNewTimeout(action, timeout, singleShot);
|
| TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerInstall", "data", InspectorTimerInstallEvent::data(context, timeoutID, timeout, singleShot));
|
| @@ -89,7 +89,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, PassOwnPtr<ScheduledActionBase> action, int interval, bool singleShot, int timeoutID)
|
| : SuspendableTimer(context)
|
| , m_timeoutID(timeoutID)
|
| , m_nestingLevel(timerNestingLevel + 1)
|
| @@ -150,7 +150,7 @@ void DOMTimer::fired()
|
| WTF_LOG(Timers, "DOMTimer::fired: m_timeoutID = %d, one-shot, m_action = %p", m_timeoutID, m_action.get());
|
|
|
| // Delete timer before executing the action for one-shot timers.
|
| - OwnPtr<ScheduledAction> action = m_action.release();
|
| + OwnPtr<ScheduledActionBase> action = m_action.release();
|
|
|
| // This timer is being deleted; no access to member variables allowed after this point.
|
| context->removeTimeoutByID(m_timeoutID);
|
|
|