Bug 895274 part.169 Rename NS_CONTENT_COMMAND_SCROLL to eContentCommandScroll r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 11 Sep 2015 01:59:53 +0900
changeset 261819 6942dd64d65e89cecab991e36c82d15e2d9c83e7
parent 261818 29bac9c0a25ab19f1d46e0304d262604c815c4e8
child 261820 22c8416176741836ab71461d76102eb1944c0083
push id29355
push usercbook@mozilla.com
push dateFri, 11 Sep 2015 14:37:04 +0000
treeherdermozilla-central@19f806034f67 [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.169 Rename NS_CONTENT_COMMAND_SCROLL to eContentCommandScroll r=smaug
dom/events/EventStateManager.cpp
widget/EventMessageList.h
widget/MiscEvents.h
widget/windows/WinMouseScrollHandler.cpp
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -751,20 +751,18 @@ EventStateManager::PreHandleEvent(nsPres
   case eContentCommandCopy:
   case eContentCommandPaste:
   case eContentCommandDelete:
   case eContentCommandUndo:
   case eContentCommandRedo:
   case eContentCommandPasteTransferable:
     DoContentCommandEvent(aEvent->AsContentCommandEvent());
     break;
-  case NS_CONTENT_COMMAND_SCROLL:
-    {
-      DoContentCommandScrollEvent(aEvent->AsContentCommandEvent());
-    }
+  case eContentCommandScroll:
+    DoContentCommandScrollEvent(aEvent->AsContentCommandEvent());
     break;
   case NS_COMPOSITION_START:
     if (aEvent->mFlags.mIsTrusted) {
       // If the event is trusted event, set the selected text to data of
       // composition event.
       WidgetCompositionEvent* compositionEvent = aEvent->AsCompositionEvent();
       WidgetQueryContentEvent selectedText(true, eQuerySelectedText,
                                            compositionEvent->widget);
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -302,23 +302,23 @@ NS_EVENT_MESSAGE(eSetSelection,         
 NS_EVENT_MESSAGE(eContentCommandEventFirst,        3800)
 NS_EVENT_MESSAGE(eContentCommandCut,               eContentCommandEventFirst)
 NS_EVENT_MESSAGE(eContentCommandCopy,              eContentCommandEventFirst + 1)
 NS_EVENT_MESSAGE(eContentCommandPaste,             eContentCommandEventFirst + 2)
 NS_EVENT_MESSAGE(eContentCommandDelete,            eContentCommandEventFirst + 3)
 NS_EVENT_MESSAGE(eContentCommandUndo,              eContentCommandEventFirst + 4)
 NS_EVENT_MESSAGE(eContentCommandRedo,              eContentCommandEventFirst + 5)
 NS_EVENT_MESSAGE(eContentCommandPasteTransferable, eContentCommandEventFirst + 6)
-// NS_CONTENT_COMMAND_SCROLL scrolls the nearest scrollable element to the
+// eContentCommandScroll scrolls the nearest scrollable element to the
 // currently focused content or latest DOM selection. This would normally be
 // the same element scrolled by keyboard scroll commands, except that this event
 // will scroll an element scrollable in either direction.  I.e., if the nearest
 // scrollable ancestor element can only be scrolled vertically, and horizontal
 // scrolling is requested using this event, no scrolling will occur.
-NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_SCROLL,        eContentCommandEventFirst + 7)
+NS_EVENT_MESSAGE(eContentCommandScroll,            eContentCommandEventFirst + 7)
 
 // Event to gesture notification
 NS_EVENT_MESSAGE(NS_GESTURENOTIFY_EVENT_START, 3900)
 
 NS_EVENT_MESSAGE(NS_ORIENTATION_EVENT,  4000)
 
 NS_EVENT_MESSAGE(NS_SCROLLAREA_EVENT_START, 4100)
 NS_EVENT_MESSAGE(NS_SCROLLEDAREACHANGED, NS_SCROLLAREA_EVENT_START)
--- a/widget/MiscEvents.h
+++ b/widget/MiscEvents.h
@@ -44,17 +44,17 @@ public:
       "WidgetQueryContentEvent needs to support Duplicate()");
     MOZ_CRASH("WidgetQueryContentEvent doesn't support Duplicate()");
     return nullptr;
   }
 
   // eContentCommandPasteTransferable
   nsCOMPtr<nsITransferable> mTransferable; // [in]
 
-  // NS_CONTENT_COMMAND_SCROLL
+  // eContentCommandScroll
   // for mScroll.mUnit
   enum
   {
     eCmdScrollUnit_Line,
     eCmdScrollUnit_Page,
     eCmdScrollUnit_Whole
   };
 
--- a/widget/windows/WinMouseScrollHandler.cpp
+++ b/widget/windows/WinMouseScrollHandler.cpp
@@ -536,19 +536,17 @@ MouseScrollHandler::ProcessNativeScrollM
 
   MOZ_LOG(gMouseScrollLog, LogLevel::Info,
     ("MouseScroll::ProcessNativeScrollMessage: aWidget=%p, "
      "aMessage=%s, wParam=0x%08X, lParam=0x%08X",
      aWidget, aMessage == WM_VSCROLL ? "WM_VSCROLL" : "WM_HSCROLL",
      aWParam, aLParam));
 
   // Scroll message generated by external application
-  WidgetContentCommandEvent commandEvent(true, NS_CONTENT_COMMAND_SCROLL,
-                                         aWidget);
-
+  WidgetContentCommandEvent commandEvent(true, eContentCommandScroll, aWidget);
   commandEvent.mScroll.mIsHorizontal = (aMessage == WM_HSCROLL);
 
   switch (LOWORD(aWParam)) {
     case SB_LINEUP:   // SB_LINELEFT
       commandEvent.mScroll.mUnit =
         WidgetContentCommandEvent::eCmdScrollUnit_Line;
       commandEvent.mScroll.mAmount = -1;
       break;