Bug 895274 part.89 Rename NS_XUL_POPUP_HIDING to eXULPopupHiding r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 04 Sep 2015 19:54:11 +0900
changeset 260830 7a48f1bb8b42a984c1ccf81dc2eb5b93583ed221
parent 260829 97e0ba98dd52703a0040a4883c626fa5170f4785
child 260831 decc683d234c431ffe003ccbbade26cf312563ff
push id64609
push usermasayuki@d-toybox.com
push dateFri, 04 Sep 2015 10:54:28 +0000
treeherdermozilla-inbound@0720ec889366 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs895274
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 895274 part.89 Rename NS_XUL_POPUP_HIDING to eXULPopupHiding r=smaug
dom/events/EventNameList.h
layout/forms/nsComboboxControlFrame.cpp
layout/xul/nsXULPopupManager.cpp
widget/EventMessageList.h
widget/cocoa/nsMenuX.mm
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -699,17 +699,17 @@ NON_IDL_EVENT(popupshowing,
               eXULPopupShowing,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popupshown,
               eXULPopupShown,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popuphiding,
-              NS_XUL_POPUP_HIDING,
+              eXULPopupHiding,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popuphidden,
               NS_XUL_POPUP_HIDDEN,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(broadcast,
               NS_XUL_BROADCAST,
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -311,19 +311,18 @@ nsComboboxControlFrame::ShowPopup(bool a
   } else {
     viewManager->SetViewVisibility(view, nsViewVisibility_kHide);
     nsRect emptyRect(0, 0, 0, 0);
     viewManager->ResizeView(view, emptyRect);
   }
 
   // fire a popup dom event
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, aShowPopup ?
-                         eXULPopupShowing : NS_XUL_POPUP_HIDING, nullptr,
-                         WidgetMouseEvent::eReal);
+  WidgetMouseEvent event(true, aShowPopup ? eXULPopupShowing : eXULPopupHiding,
+                         nullptr, WidgetMouseEvent::eReal);
 
   nsCOMPtr<nsIPresShell> shell = PresContext()->GetPresShell();
   if (shell)
     shell->HandleDOMEventWithTarget(mContent, &event, &status);
 }
 
 bool
 nsComboboxControlFrame::ShowList(bool aShowList)
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -1429,17 +1429,17 @@ nsXULPopupManager::FirePopupHidingEvent(
                                         nsPresContext *aPresContext,
                                         nsPopupType aPopupType,
                                         bool aDeselectMenu,
                                         bool aIsCancel)
 {
   nsCOMPtr<nsIPresShell> presShell = aPresContext->PresShell();
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, NS_XUL_POPUP_HIDING, nullptr,
+  WidgetMouseEvent event(true, eXULPopupHiding, nullptr,
                          WidgetMouseEvent::eReal);
   EventDispatcher::Dispatch(aPopup, aPresContext, &event, nullptr, &status);
 
   // when a panel is closed, blur whatever has focus inside the popup
   if (aPopupType == ePopupTypePanel &&
       !aPopup->AttrValueIs(kNameSpaceID_None, nsGkAtoms::noautofocus,
                            nsGkAtoms::_true, eCaseMatters)) {
     nsIFocusManager* fm = nsFocusManager::GetFocusManager();
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -113,17 +113,17 @@ NS_EVENT_MESSAGE(eDragStart,            
 NS_EVENT_MESSAGE(eDrop,                 eDragDropEventFirst + 8)
 NS_EVENT_MESSAGE(eDragLeave,            eDragDropEventFirst + 9)
 NS_EVENT_MESSAGE(eDragDropEventLast,    eDragLeave)
 
 // XUL specific events
 NS_EVENT_MESSAGE(eXULEventFirst,        1500)
 NS_EVENT_MESSAGE(eXULPopupShowing,      eXULEventFirst)
 NS_EVENT_MESSAGE(eXULPopupShown,        eXULEventFirst + 1)
-NS_EVENT_MESSAGE(NS_XUL_POPUP_HIDING,   eXULEventFirst + 2)
+NS_EVENT_MESSAGE(eXULPopupHiding,       eXULEventFirst + 2)
 NS_EVENT_MESSAGE(NS_XUL_POPUP_HIDDEN,   eXULEventFirst + 3)
 NS_EVENT_MESSAGE(NS_XUL_BROADCAST,      eXULEventFirst + 5)
 NS_EVENT_MESSAGE(NS_XUL_COMMAND_UPDATE, eXULEventFirst + 6)
 
 // Scroll events
 NS_EVENT_MESSAGE(NS_MOUSE_SCROLL_START, 1600)
 NS_EVENT_MESSAGE(NS_MOUSE_SCROLL,       NS_MOUSE_SCROLL_START)
 NS_EVENT_MESSAGE(NS_MOUSE_PIXEL_SCROLL, NS_MOUSE_SCROLL_START + 1)
--- a/widget/cocoa/nsMenuX.mm
+++ b/widget/cocoa/nsMenuX.mm
@@ -593,17 +593,17 @@ bool nsMenuX::OnOpen()
 // Returns TRUE if we should keep processing the event, FALSE if the handler
 // wants to stop the closing of the menu.
 bool nsMenuX::OnClose()
 {
   if (mDestroyHandlerCalled)
     return true;
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, NS_XUL_POPUP_HIDING, nullptr,
+  WidgetMouseEvent event(true, eXULPopupHiding, nullptr,
                          WidgetMouseEvent::eReal);
 
   nsCOMPtr<nsIContent> popupContent;
   GetMenuPopupContent(getter_AddRefs(popupContent));
 
   nsresult rv = NS_OK;
   nsIContent* dispatchTo = popupContent ? popupContent : mContent;
   rv = dispatchTo->DispatchDOMEvent(&event, nullptr, nullptr, &status);