| Index: third_party/WebKit/Source/core/page/DOMWindowPagePopup.h
|
| diff --git a/third_party/WebKit/Source/core/page/DOMWindowPagePopup.h b/third_party/WebKit/Source/core/page/DOMWindowPagePopup.h
|
| index b80d00ad08b582fcf2578b6e0d8f5dcbb0e9cba8..49e461d9058a8c91853b3315519a76b87d965c97 100644
|
| --- a/third_party/WebKit/Source/core/page/DOMWindowPagePopup.h
|
| +++ b/third_party/WebKit/Source/core/page/DOMWindowPagePopup.h
|
| @@ -42,22 +42,19 @@ class PagePopup;
|
| class PagePopupClient;
|
| class PagePopupController;
|
|
|
| -class CORE_EXPORT DOMWindowPagePopup final : public NoBaseWillBeGarbageCollected<DOMWindowPagePopup>, public WillBeHeapSupplement<LocalDOMWindow> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowPagePopup);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(DOMWindowPagePopup);
|
| +class CORE_EXPORT DOMWindowPagePopup final : public GarbageCollected<DOMWindowPagePopup>, public HeapSupplement<LocalDOMWindow> {
|
| + USING_GARBAGE_COLLECTED_MIXIN(DOMWindowPagePopup);
|
| public:
|
| static PagePopupController* pagePopupController(DOMWindow&);
|
| static void install(LocalDOMWindow&, PagePopup&, PagePopupClient*);
|
| static void uninstall(LocalDOMWindow&);
|
| - DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup);
|
| -
|
| DECLARE_TRACE();
|
|
|
| private:
|
| DOMWindowPagePopup(PagePopup&, PagePopupClient*);
|
| static const char* supplementName();
|
|
|
| - RefPtrWillBeMember<PagePopupController> m_controller;
|
| + Member<PagePopupController> m_controller;
|
| };
|
|
|
| } // namespace blink
|
|
|