| Index: third_party/WebKit/Source/core/frame/DOMTimer.h
|
| diff --git a/third_party/WebKit/Source/core/frame/DOMTimer.h b/third_party/WebKit/Source/core/frame/DOMTimer.h
|
| index 59236c8a6ca91ca215726f03c1b2f7e1982a316f..50b24e3475ceca0af50cec23e8cd0b5a2392cc9e 100644
|
| --- a/third_party/WebKit/Source/core/frame/DOMTimer.h
|
| +++ b/third_party/WebKit/Source/core/frame/DOMTimer.h
|
| @@ -40,11 +40,11 @@ namespace blink {
|
|
|
| class ExecutionContext;
|
|
|
| -class CORE_EXPORT DOMTimer final : public RefCountedWillBeGarbageCollectedFinalized<DOMTimer>, public SuspendableTimer {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMTimer);
|
| +class CORE_EXPORT DOMTimer final : public GarbageCollectedFinalized<DOMTimer>, public SuspendableTimer {
|
| + USING_GARBAGE_COLLECTED_MIXIN(DOMTimer);
|
| public:
|
| // Creates a new timer owned by the ExecutionContext, starts it and returns its ID.
|
| - static int install(ExecutionContext*, PassOwnPtrWillBeRawPtr<ScheduledAction>, int timeout, bool singleShot);
|
| + static int install(ExecutionContext*, RawPtr<ScheduledAction>, int timeout, bool singleShot);
|
| static void removeByID(ExecutionContext*, int timeoutID);
|
|
|
| ~DOMTimer() override;
|
| @@ -64,19 +64,19 @@ public:
|
| private:
|
| friend class DOMTimerCoordinator; // For create().
|
|
|
| - static PassRefPtrWillBeRawPtr<DOMTimer> create(ExecutionContext* context, PassOwnPtrWillBeRawPtr<ScheduledAction> action, int timeout, bool singleShot, int timeoutID)
|
| + static RawPtr<DOMTimer> create(ExecutionContext* context, RawPtr<ScheduledAction> action, int timeout, bool singleShot, int timeoutID)
|
| {
|
| - return adoptRefWillBeNoop(new DOMTimer(context, action, timeout, singleShot, timeoutID));
|
| + return (new DOMTimer(context, action, timeout, singleShot, timeoutID));
|
| }
|
|
|
| - DOMTimer(ExecutionContext*, PassOwnPtrWillBeRawPtr<ScheduledAction>, int interval, bool singleShot, int timeoutID);
|
| + DOMTimer(ExecutionContext*, RawPtr<ScheduledAction>, int interval, bool singleShot, int timeoutID);
|
| void fired() override;
|
|
|
| WebTaskRunner* timerTaskRunner() override;
|
|
|
| int m_timeoutID;
|
| int m_nestingLevel;
|
| - OwnPtrWillBeMember<ScheduledAction> m_action;
|
| + Member<ScheduledAction> m_action;
|
| RefPtr<UserGestureToken> m_userGestureToken;
|
| };
|
|
|
|
|