| Index: third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| diff --git a/third_party/WebKit/Source/web/ExternalPopupMenu.cpp b/third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| index 08717cc9e4a75d4f37d06814cc69f9c266de1f21..09125ee44ffc3b4690cdcb22eb5ecafb2e4b56a6 100644
|
| --- a/third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| +++ b/third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| @@ -187,7 +187,6 @@ void ExternalPopupMenu::didAcceptIndex(int index)
|
| // derefed. This ensures it does not get deleted while we are running this
|
| // method.
|
| int popupMenuItemIndex = toPopupMenuItemIndex(index, *m_ownerElement);
|
| - RawPtr<ExternalPopupMenu> guard(this);
|
|
|
| if (m_ownerElement) {
|
| m_ownerElement->popupDidHide();
|
| @@ -203,10 +202,6 @@ void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices)
|
| return;
|
| }
|
|
|
| - // Calling methods on the HTMLSelectElement might lead to this object being
|
| - // derefed. This ensures it does not get deleted while we are running this
|
| - // method.
|
| - RawPtr<ExternalPopupMenu> protect(this);
|
| RawPtr<HTMLSelectElement> ownerElement(m_ownerElement.get());
|
| ownerElement->popupDidHide();
|
|
|
| @@ -222,9 +217,6 @@ void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices)
|
|
|
| void ExternalPopupMenu::didCancel()
|
| {
|
| - // See comment in didAcceptIndex on why we need this.
|
| - RawPtr<ExternalPopupMenu> guard(this);
|
| -
|
| if (m_ownerElement)
|
| m_ownerElement->popupDidHide();
|
| m_webExternalPopupMenu = 0;
|
|
|