Bug 895274 part.148 Rename NS_MOUSE_PIXEL_SCROLL to eLegacyMousePixelScroll r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 10 Sep 2015 10:40:04 +0900
changeset 294294 7f6201ff997f763e3e6aff0689b742c043244a39
parent 294293 c46079d8b6ed24f7533f1844873b8f18bdffc13c
child 294295 4cdae41b9305f75ac82226a52f860ecd512c547c
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [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.148 Rename NS_MOUSE_PIXEL_SCROLL to eLegacyMousePixelScroll r=smaug
dom/events/EventNameList.h
dom/events/EventStateManager.cpp
dom/events/EventStateManager.h
widget/EventMessageList.h
widget/MouseEvents.h
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -632,17 +632,17 @@ NON_IDL_EVENT(DOMFocusOut,
               EventNameType_HTMLXUL,
               eUIEventClass)
                                   
 NON_IDL_EVENT(DOMMouseScroll,
               eLegacyMouseLineOrPageScroll,
               EventNameType_HTMLXUL,
               eMouseScrollEventClass)
 NON_IDL_EVENT(MozMousePixelScroll,
-              NS_MOUSE_PIXEL_SCROLL,
+              eLegacyMousePixelScroll,
               EventNameType_HTMLXUL,
               eMouseScrollEventClass)
                                                 
 NON_IDL_EVENT(open,
               NS_OPEN,
               EventNameType_None,
               eBasicEventClass)
 
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2228,18 +2228,18 @@ EventStateManager::SendPixelScrollEvent(
     if (!targetContent)
       return;
   }
 
   while (targetContent->IsNodeOfType(nsINode::eTEXT)) {
     targetContent = targetContent->GetParent();
   }
 
-  WidgetMouseScrollEvent event(aEvent->mFlags.mIsTrusted, NS_MOUSE_PIXEL_SCROLL,
-                               aEvent->widget);
+  WidgetMouseScrollEvent event(aEvent->mFlags.mIsTrusted,
+                               eLegacyMousePixelScroll, aEvent->widget);
   event.mFlags.mDefaultPrevented = aState.mDefaultPrevented;
   event.mFlags.mDefaultPreventedByContent = aState.mDefaultPreventedByContent;
   event.refPoint = aEvent->refPoint;
   event.widget = aEvent->widget;
   event.time = aEvent->time;
   event.timeStamp = aEvent->timeStamp;
   event.modifiers = aEvent->modifiers;
   event.buttons = aEvent->buttons;
--- a/dom/events/EventStateManager.h
+++ b/dom/events/EventStateManager.h
@@ -105,17 +105,17 @@ public:
    */
   nsresult PostHandleEvent(nsPresContext* aPresContext,
                            WidgetEvent* aEvent,
                            nsIFrame* aTargetFrame,
                            nsEventStatus* aStatus);
 
   /**
    * DispatchLegacyMouseScrollEvents() dispatches eLegacyMouseLineOrPageScroll
-   * event and NS_MOUSE_PIXEL_SCROLL event for compatibility with old Gecko.
+   * event and eLegacyMousePixelScroll event for compatibility with old Gecko.
    */
   void DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame,
                                        WidgetWheelEvent* aEvent,
                                        nsEventStatus* aStatus);
 
   void NotifyDestroyPresContext(nsPresContext* aPresContext);
   void SetPresContext(nsPresContext* aPresContext);
   void ClearFrameRefs(nsIFrame* aFrame);
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -121,17 +121,17 @@ NS_EVENT_MESSAGE(eXULPopupShown,        
 NS_EVENT_MESSAGE(eXULPopupHiding,       eXULEventFirst + 2)
 NS_EVENT_MESSAGE(eXULPopupHidden,       eXULEventFirst + 3)
 NS_EVENT_MESSAGE(eXULBroadcast,         eXULEventFirst + 5)
 NS_EVENT_MESSAGE(eXULCommandUpdate,     eXULEventFirst + 6)
 
 // Legacy mouse scroll (wheel) events
 NS_EVENT_MESSAGE(eLegacyMouseScrollEventFirst, 1600)
 NS_EVENT_MESSAGE(eLegacyMouseLineOrPageScroll, eLegacyMouseScrollEventFirst)
-NS_EVENT_MESSAGE(NS_MOUSE_PIXEL_SCROLL,        eLegacyMouseScrollEventFirst + 1)
+NS_EVENT_MESSAGE(eLegacyMousePixelScroll,      eLegacyMouseScrollEventFirst + 1)
 
 NS_EVENT_MESSAGE(NS_SCROLLPORT_START,     1700)
 NS_EVENT_MESSAGE(NS_SCROLLPORT_UNDERFLOW, NS_SCROLLPORT_START)
 NS_EVENT_MESSAGE(NS_SCROLLPORT_OVERFLOW,  NS_SCROLLPORT_START + 1)
 
 NS_EVENT_MESSAGE(eLegacyMutationEventFirst,       1800)
 NS_EVENT_MESSAGE(eLegacySubtreeModified,          eLegacyMutationEventFirst)
 NS_EVENT_MESSAGE(eLegacyNodeInserted,             eLegacyMutationEventFirst + 1)
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -398,17 +398,17 @@ public:
     return result;
   }
 
   // The delta value of mouse scroll event.
   // If the event message is eLegacyMouseLineOrPageScroll, the value indicates
   // scroll amount in lines.  However, if the value is
   // nsIDOMUIEvent::SCROLL_PAGE_UP or nsIDOMUIEvent::SCROLL_PAGE_DOWN, the
   // value inducates one page scroll.  If the event message is
-  // NS_MOUSE_PIXEL_SCROLL, the value indicates scroll amount in pixels.
+  // eLegacyMousePixelScroll, the value indicates scroll amount in pixels.
   int32_t delta;
 
   // If this is true, it may cause to scroll horizontally.
   // Otherwise, vertically.
   bool isHorizontal;
 
   void AssignMouseScrollEventData(const WidgetMouseScrollEvent& aEvent,
                                   bool aCopyTargets)