Bug 1379728 part 1. Remove the double-definition of the 'close' event from EventNameList.h.

Tag #1343
This commit is contained in:
Gaming4JC 2020-01-07 09:48:00 -05:00 • committed by Roy Tam
commit 8b32eff646
2 changed files with 3 additions and 7 deletions

View file

@ -174,7 +174,7 @@ EVENT(click,
eMouseEventClass) eMouseEventClass)
EVENT(close, EVENT(close,
eClose, eClose,
EventNameType_HTML, EventNameType_HTMLXUL,
eBasicEventClass) eBasicEventClass)
EVENT(contextmenu, EVENT(contextmenu,
eContextMenu, eContextMenu,
@ -777,10 +777,6 @@ NON_IDL_EVENT(command,
eXULCommand, eXULCommand,
EventNameType_XUL, EventNameType_XUL,
eInputEventClass) eInputEventClass)
NON_IDL_EVENT(close,
eWindowClose,
EventNameType_XUL,
eBasicEventClass)
NON_IDL_EVENT(popupshowing, NON_IDL_EVENT(popupshowing,
eXULPopupShowing, eXULPopupShowing,
EventNameType_XUL, EventNameType_XUL,

View file

@ -323,7 +323,7 @@ nsWebShellWindow::RequestWindowClose(nsIWidget* aWidget)
RefPtr<nsPresContext> presContext = presShell->GetPresContext(); RefPtr<nsPresContext> presContext = presShell->GetPresContext();
nsEventStatus status = nsEventStatus_eIgnore; nsEventStatus status = nsEventStatus_eIgnore;
WidgetMouseEvent event(true, eWindowClose, nullptr, WidgetMouseEvent event(true, eClose, nullptr,
WidgetMouseEvent::eReal); WidgetMouseEvent::eReal);
if (NS_SUCCEEDED(eventTarget->DispatchDOMEvent(&event, nullptr, presContext, &status)) && if (NS_SUCCEEDED(eventTarget->DispatchDOMEvent(&event, nullptr, presContext, &status)) &&
status == nsEventStatus_eConsumeNoDefault) status == nsEventStatus_eConsumeNoDefault)
@ -759,7 +759,7 @@ bool nsWebShellWindow::ExecuteCloseHandler()
contentViewer->GetPresContext(getter_AddRefs(presContext)); contentViewer->GetPresContext(getter_AddRefs(presContext));
nsEventStatus status = nsEventStatus_eIgnore; nsEventStatus status = nsEventStatus_eIgnore;
WidgetMouseEvent event(true, eWindowClose, nullptr, WidgetMouseEvent event(true, eClose, nullptr,
WidgetMouseEvent::eReal); WidgetMouseEvent::eReal);
nsresult rv = nsresult rv =