Bug 895274 part.87 Rename NS_XUL_POPUP_SHOWING to eXULPopupShowing r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 04 Sep 2015 19:54:11 +0900
changeset 260828 c24765571791120685b21e7f5b8bc7dc625a1eae
parent 260827 e109ec7a6df6621a08bfe34e6e6c4e159bf2c8d4
child 260829 97e0ba98dd52703a0040a4883c626fa5170f4785
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.87 Rename NS_XUL_POPUP_SHOWING to eXULPopupShowing 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
@@ -691,17 +691,17 @@ NON_IDL_EVENT(command,
               NS_XUL_COMMAND,
               EventNameType_XUL,
               eInputEventClass)
 NON_IDL_EVENT(close,
               eWindowClose,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popupshowing,
-              NS_XUL_POPUP_SHOWING,
+              eXULPopupShowing,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popupshown,
               NS_XUL_POPUP_SHOWN,
               EventNameType_XUL,
               eBasicEventClass)
 NON_IDL_EVENT(popuphiding,
               NS_XUL_POPUP_HIDING,
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -312,17 +312,17 @@ nsComboboxControlFrame::ShowPopup(bool a
     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 ?
-                         NS_XUL_POPUP_SHOWING : NS_XUL_POPUP_HIDING, nullptr,
+                         eXULPopupShowing : NS_XUL_POPUP_HIDING, nullptr,
                          WidgetMouseEvent::eReal);
 
   nsCOMPtr<nsIPresShell> shell = PresContext()->GetPresShell();
   if (shell)
     shell->HandleDOMEventWithTarget(mContent, &event, &status);
 }
 
 bool
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -1349,17 +1349,17 @@ nsXULPopupManager::FirePopupShowingEvent
                               NS_FRAME_HAS_DIRTY_CHILDREN);
 
   // cache the popup so that document.popupNode can retrieve the trigger node
   // during the popupshowing event. It will be cleared below after the event
   // has fired.
   mOpeningPopup = aPopup;
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, NS_XUL_POPUP_SHOWING, nullptr,
+  WidgetMouseEvent event(true, eXULPopupShowing, nullptr,
                          WidgetMouseEvent::eReal);
 
   // coordinates are relative to the root widget
   nsPresContext* rootPresContext =
     presShell->GetPresContext()->GetRootPresContext();
   if (rootPresContext) {
     rootPresContext->PresShell()->GetViewManager()->
       GetRootWidget(getter_AddRefs(event.widget));
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -111,17 +111,17 @@ NS_EVENT_MESSAGE(eDrag,                 
 NS_EVENT_MESSAGE(eDragEnd,              eDragDropEventFirst + 6)
 NS_EVENT_MESSAGE(eDragStart,            eDragDropEventFirst + 7)
 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(NS_XUL_POPUP_SHOWING,  eXULEventFirst)
+NS_EVENT_MESSAGE(eXULPopupShowing,      eXULEventFirst)
 NS_EVENT_MESSAGE(NS_XUL_POPUP_SHOWN,    eXULEventFirst + 1)
 NS_EVENT_MESSAGE(NS_XUL_POPUP_HIDING,   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)
--- a/widget/cocoa/nsMenuX.mm
+++ b/widget/cocoa/nsMenuX.mm
@@ -555,34 +555,34 @@ void nsMenuX::LoadSubMenu(nsIContent* in
   menu.forget();
 }
 
 // This menu is about to open. Returns TRUE if we should keep processing the event,
 // FALSE if the handler wants to stop the opening of the menu.
 bool nsMenuX::OnOpen()
 {
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, NS_XUL_POPUP_SHOWING, nullptr,
+  WidgetMouseEvent event(true, eXULPopupShowing, 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);
   if (NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault)
     return false;
 
   // If the open is going to succeed we need to walk our menu items, checking to
   // see if any of them have a command attribute. If so, several attributes
   // must potentially be updated.
 
   // Get new popup content first since it might have changed as a result of the
-  // NS_XUL_POPUP_SHOWING event above.
+  // eXULPopupShowing event above.
   GetMenuPopupContent(getter_AddRefs(popupContent));
   if (!popupContent)
     return true;
 
   nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
   if (pm) {
     pm->UpdateMenuItems(popupContent);
   }