| Index: third_party/WebKit/Source/core/page/DOMWindowPagePopup.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/DOMWindowPagePopup.cpp b/third_party/WebKit/Source/core/page/DOMWindowPagePopup.cpp
|
| index 6fe0de5671c302c38e9066b1c37da3e8f9896aff..5c86a7c0fd7c12ddd0b02ab8273fa99dcfb7d02c 100644
|
| --- a/third_party/WebKit/Source/core/page/DOMWindowPagePopup.cpp
|
| +++ b/third_party/WebKit/Source/core/page/DOMWindowPagePopup.cpp
|
| @@ -41,8 +41,6 @@ DOMWindowPagePopup::DOMWindowPagePopup(PagePopup& popup, PagePopupClient* popupC
|
| ASSERT(popupClient);
|
| }
|
|
|
| -DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup);
|
| -
|
| const char* DOMWindowPagePopup::supplementName()
|
| {
|
| return "DOMWindowPagePopup";
|
| @@ -58,7 +56,7 @@ PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow& window)
|
| void DOMWindowPagePopup::install(LocalDOMWindow& window, PagePopup& popup, PagePopupClient* popupClient)
|
| {
|
| ASSERT(popupClient);
|
| - provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopup(popup, popupClient)));
|
| + provideTo(window, supplementName(), (new DOMWindowPagePopup(popup, popupClient)));
|
| }
|
|
|
| void DOMWindowPagePopup::uninstall(LocalDOMWindow& window)
|
| @@ -70,7 +68,7 @@ void DOMWindowPagePopup::uninstall(LocalDOMWindow& window)
|
| DEFINE_TRACE(DOMWindowPagePopup)
|
| {
|
| visitor->trace(m_controller);
|
| - WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
|
| + HeapSupplement<LocalDOMWindow>::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|