Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Boris Zbarsky 2017-07-11 17:49:24 -04:00
parent 3d56aac575
commit 49dbf6fa43
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/events/EventNameList.h
View File

@ -182,7 +182,7 @@ EVENT(click,
eMouseEventClass) eMouseEventClass)
EVENT(close, EVENT(close,
eClose, eClose,
EventNameType_HTML, EventNameType_HTMLXUL,
eBasicEventClass) eBasicEventClass)
EVENT(contextmenu, EVENT(contextmenu,
eContextMenu, eContextMenu,
@ -784,10 +784,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,

4
xpfe/appshell/nsWebShellWindow.cpp
View File

@ -331,7 +331,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)
@ -703,7 +703,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 =