Bug 895274 part.17 Rename NS_SCROLL_EVENT to eScroll r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Sat, 29 Aug 2015 08:58:28 +0900
changeset 259930 862ef097c279ec53b682694351d11e61083e08d0
parent 259929 90da8b9aaf2e777b0ed64773f75e4cd45a9b3e8a
child 259931 da3eb3291c32042466fcc13813d85b6b758413d7
push id29296
push userryanvm@gmail.com
push dateSun, 30 Aug 2015 19:45:10 +0000
treeherdermozilla-central@2ad5077d86ba [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.17 Rename NS_SCROLL_EVENT to eScroll r=smaug
dom/base/FragmentOrElement.cpp
dom/events/EventNameList.h
layout/generic/nsGfxScrollFrame.cpp
layout/xul/tree/nsTreeBodyFrame.cpp
widget/EventMessageList.h
--- a/dom/base/FragmentOrElement.cpp
+++ b/dom/base/FragmentOrElement.cpp
@@ -808,17 +808,17 @@ nsIContent::PreHandleEvent(EventChainPre
     switch (aVisitor.mEvent->mMessage) {
       case NS_IMAGE_ABORT:
       case NS_LOAD_ERROR:
       case NS_FORM_SELECTED:
       case NS_FORM_CHANGE:
       case NS_LOAD:
       case NS_FORM_RESET:
       case eResize:
-      case NS_SCROLL_EVENT:
+      case eScroll:
         stopEvent = true;
         break;
       case NS_USER_DEFINED_EVENT:
         if (aVisitor.mDOMEvent) {
           nsAutoString eventType;
           aVisitor.mDOMEvent->GetType(eventType);
           if (eventType.EqualsLiteral("abort") ||
               eventType.EqualsLiteral("error") ||
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -459,17 +459,17 @@ FORWARDED_EVENT(load,
                 NS_LOAD,
                 EventNameType_All,
                 eBasicEventClass)
 FORWARDED_EVENT(resize,
                 eResize,
                 EventNameType_All,
                 eBasicEventClass)
 FORWARDED_EVENT(scroll,
-                NS_SCROLL_EVENT,
+                eScroll,
                 (EventNameType_HTMLXUL | EventNameType_SVGSVG),
                 eBasicEventClass)
 
 WINDOW_EVENT(afterprint,
              NS_AFTERPRINT,
              EventNameType_XUL | EventNameType_HTMLBodyOrFramesetOnly,
              eBasicEventClass)
 WINDOW_EVENT(beforeprint,
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -4111,17 +4111,17 @@ ScrollFrameHelper::ScrollEvent::Run()
   return NS_OK;
 }
 
 void
 ScrollFrameHelper::FireScrollEvent()
 {
   mScrollEvent.Forget();
 
-  WidgetGUIEvent event(true, NS_SCROLL_EVENT, nullptr);
+  WidgetGUIEvent event(true, eScroll, nullptr);
   nsEventStatus status = nsEventStatus_eIgnore;
   nsIContent* content = mOuter->GetContent();
   nsPresContext* prescontext = mOuter->PresContext();
   // Fire viewport scroll events at the document (where they
   // will bubble to the window)
   if (mIsRoot) {
     nsIDocument* doc = content->GetCurrentDoc();
     if (doc) {
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -4543,17 +4543,17 @@ nsTreeBodyFrame::ScrollEvent::Run()
   return NS_OK;
 }
 
 
 void
 nsTreeBodyFrame::FireScrollEvent()
 {
   mScrollEvent.Forget();
-  WidgetGUIEvent event(true, NS_SCROLL_EVENT, nullptr);
+  WidgetGUIEvent event(true, eScroll, nullptr);
   // scroll events fired at elements don't bubble
   event.mFlags.mBubbles = false;
   EventDispatcher::Dispatch(GetContent(), PresContext(), &event);
 }
 
 void
 nsTreeBodyFrame::PostScrollEvent()
 {
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -24,17 +24,17 @@ NS_EVENT_MESSAGE(eKeyUp,                
 NS_EVENT_MESSAGE(eKeyDown,              eWindowEventFirst + 33)
 
 NS_EVENT_MESSAGE(eBeforeKeyDown,        eWindowEventFirst + 34)
 NS_EVENT_MESSAGE(eAfterKeyDown,         eWindowEventFirst + 35)
 NS_EVENT_MESSAGE(eBeforeKeyUp,          eWindowEventFirst + 36)
 NS_EVENT_MESSAGE(eAfterKeyUp,           eWindowEventFirst + 37)
 
 NS_EVENT_MESSAGE(eResize,               eWindowEventFirst + 60)
-NS_EVENT_MESSAGE(NS_SCROLL_EVENT,       eWindowEventFirst + 61)
+NS_EVENT_MESSAGE(eScroll,               eWindowEventFirst + 61)
 
 // A plugin was clicked or otherwise focused. NS_PLUGIN_ACTIVATE should be
 // used when the window is not active. NS_PLUGIN_FOCUS should be used when
 // the window is active. In the latter case, the dispatcher of the event
 // is expected to ensure that the plugin's widget is focused beforehand.
 NS_EVENT_MESSAGE(NS_PLUGIN_ACTIVATE,    eWindowEventFirst + 62)
 NS_EVENT_MESSAGE(NS_PLUGIN_FOCUS,       eWindowEventFirst + 63)