| Index: third_party/WebKit/Source/core/dom/MainThreadTaskRunner.h
|
| diff --git a/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.h b/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.h
|
| index f661b888f9de34cb432aaa3869d83d1deb0a7cc9..6c77e61ff2d6c3d9e92c5486be5fbe2d82d83038 100644
|
| --- a/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.h
|
| +++ b/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.h
|
| @@ -42,12 +42,10 @@ namespace blink {
|
| class ExecutionContext;
|
| class ExecutionContextTask;
|
|
|
| -class CORE_EXPORT MainThreadTaskRunner final : public NoBaseWillBeGarbageCollectedFinalized<MainThreadTaskRunner> {
|
| +class CORE_EXPORT MainThreadTaskRunner final : public GarbageCollectedFinalized<MainThreadTaskRunner> {
|
| WTF_MAKE_NONCOPYABLE(MainThreadTaskRunner);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(MainThreadTaskRunner);
|
| -
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<MainThreadTaskRunner> create(ExecutionContext*);
|
| + static RawPtr<MainThreadTaskRunner> create(ExecutionContext*);
|
|
|
| ~MainThreadTaskRunner();
|
|
|
| @@ -65,9 +63,9 @@ private:
|
|
|
| void pendingTasksTimerFired(Timer<MainThreadTaskRunner>*);
|
|
|
| - WeakPtrWillBeRawPtr<MainThreadTaskRunner> createWeakPointerToSelf();
|
| + RawPtr<MainThreadTaskRunner> createWeakPointerToSelf();
|
|
|
| - RawPtrWillBeMember<ExecutionContext> m_context;
|
| + Member<ExecutionContext> m_context;
|
| #if !ENABLE(OILPAN)
|
| WeakPtrFactory<MainThreadTaskRunner> m_weakFactory;
|
| #endif
|
| @@ -76,9 +74,9 @@ private:
|
| bool m_suspended;
|
| };
|
|
|
| -inline PassOwnPtrWillBeRawPtr<MainThreadTaskRunner> MainThreadTaskRunner::create(ExecutionContext* context)
|
| +inline RawPtr<MainThreadTaskRunner> MainThreadTaskRunner::create(ExecutionContext* context)
|
| {
|
| - return adoptPtrWillBeNoop(new MainThreadTaskRunner(context));
|
| + return (new MainThreadTaskRunner(context));
|
| }
|
|
|
| } // namespace blink
|
|
|