| Index: third_party/WebKit/Source/core/page/PagePopupSupplement.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/PagePopupSupplement.cpp b/third_party/WebKit/Source/core/page/PagePopupSupplement.cpp
|
| index 59022be359d041e26ae9826b9c5b1ff3d5b5cd1a..7dc610715295f5b56268d67aa095bed71eabd7ef 100644
|
| --- a/third_party/WebKit/Source/core/page/PagePopupSupplement.cpp
|
| +++ b/third_party/WebKit/Source/core/page/PagePopupSupplement.cpp
|
| @@ -40,8 +40,6 @@ PagePopupSupplement::PagePopupSupplement(PagePopup& popup, PagePopupClient* popu
|
| ASSERT(popupClient);
|
| }
|
|
|
| -DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(PagePopupSupplement);
|
| -
|
| const char* PagePopupSupplement::supplementName()
|
| {
|
| return "PagePopupSupplement";
|
| @@ -57,7 +55,7 @@ PagePopupController* PagePopupSupplement::pagePopupController(LocalFrame& frame)
|
| void PagePopupSupplement::install(LocalFrame& frame, PagePopup& popup, PagePopupClient* popupClient)
|
| {
|
| ASSERT(popupClient);
|
| - provideTo(frame, supplementName(), adoptPtrWillBeNoop(new PagePopupSupplement(popup, popupClient)));
|
| + provideTo(frame, supplementName(), new PagePopupSupplement(popup, popupClient));
|
| }
|
|
|
| void PagePopupSupplement::uninstall(LocalFrame& frame)
|
| @@ -69,7 +67,7 @@ void PagePopupSupplement::uninstall(LocalFrame& frame)
|
| DEFINE_TRACE(PagePopupSupplement)
|
| {
|
| visitor->trace(m_controller);
|
| - WillBeHeapSupplement<LocalFrame>::trace(visitor);
|
| + HeapSupplement<LocalFrame>::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|