| Index: third_party/WebKit/Source/core/dom/ScopedWindowFocusAllowedIndicator.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ScopedWindowFocusAllowedIndicator.h b/third_party/WebKit/Source/core/dom/ScopedWindowFocusAllowedIndicator.h
|
| index 51c53678ae78790c518460f0996d637e5769a97e..01917758ca0d3589994c7f5ebf2896e546fcaf7e 100644
|
| --- a/third_party/WebKit/Source/core/dom/ScopedWindowFocusAllowedIndicator.h
|
| +++ b/third_party/WebKit/Source/core/dom/ScopedWindowFocusAllowedIndicator.h
|
| @@ -16,7 +16,7 @@ class ScopedWindowFocusAllowedIndicator final {
|
| WTF_MAKE_NONCOPYABLE(ScopedWindowFocusAllowedIndicator);
|
| public:
|
| explicit ScopedWindowFocusAllowedIndicator(ExecutionContext* executionContext)
|
| - : m_observer(adoptPtrWillBeNoop(new Observer(executionContext)))
|
| + : m_observer(new Observer(executionContext))
|
| {
|
| }
|
| ~ScopedWindowFocusAllowedIndicator()
|
| @@ -25,8 +25,8 @@ public:
|
| }
|
|
|
| private:
|
| - class Observer final : public NoBaseWillBeGarbageCollectedFinalized<Observer>, public ContextLifecycleObserver {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Observer);
|
| + class Observer final : public GarbageCollectedFinalized<Observer>, public ContextLifecycleObserver {
|
| + USING_GARBAGE_COLLECTED_MIXIN(Observer);
|
| public:
|
| explicit Observer(ExecutionContext* executionContext)
|
| : ContextLifecycleObserver(executionContext)
|
| @@ -51,7 +51,7 @@ private:
|
| // The Observer indirection is needed to keep
|
| // ScopedWindowFocusAllowedIndicator off-heap and thus allows its destructor
|
| // to call getExecutionContext()->consumeWindowInteraction().
|
| - OwnPtrWillBePersistent<Observer> m_observer;
|
| + Persistent<Observer> m_observer;
|
| };
|
|
|
| } // namespace blink
|
|
|