Bug 1046101 part.9 Rename NS_SELECTION_EVENT to eSelectionEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:49 +0900
changeset 220547 090872caa52cd2dbd12ed9d27dc10b4549044b57
parent 220546 c9d1559b53209afc90e932335c28a23d7cb8fed8
child 220548 d1866b96921bee8fd9a0780f45314ef7930d26a9
push id583
push userbhearsum@mozilla.com
push dateMon, 24 Nov 2014 19:04:58 +0000
treeherdermozilla-release@c107e74250f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1046101
milestone34.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 1046101 part.9 Rename NS_SELECTION_EVENT to eSelectionEventClass r=smaug
widget/BasicEvents.h
widget/TextEvents.h
widget/shared/WidgetEventImpl.cpp
widget/xpwidgets/PuppetWidget.cpp
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -31,17 +31,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   eInputEventClass,                  // WidgetInputEvent
   eUIEventClass,                     // InternalUIEvent
 
   // TextEvents.h
   eKeyboardEventClass,               // WidgetKeyboardEvent
   eCompositionEventClass,            // WidgetCompositionEvent
   eTextEventClass,                   // WidgetTextEvent
   eQueryContentEventClass,           // WidgetQueryContentEvent
-  NS_SELECTION_EVENT,                // WidgetSelectionEvent
+  eSelectionEventClass,              // WidgetSelectionEvent
   NS_EDITOR_INPUT_EVENT,             // InternalEditorInputEvent
 
   // MouseEvents.h
   NS_MOUSE_EVENT,                    // WidgetMouseEvent
   NS_DRAG_EVENT,                     // WidgetDragEvent
   NS_MOUSE_SCROLL_EVENT,             // WidgetMouseScrollEvent
   NS_WHEEL_EVENT,                    // WidgetWheelEvent
   NS_POINTER_EVENT,                  // PointerEvent
--- a/widget/TextEvents.h
+++ b/widget/TextEvents.h
@@ -492,17 +492,17 @@ public:
 
 public:
   virtual WidgetSelectionEvent* AsSelectionEvent() MOZ_OVERRIDE
   {
     return this;
   }
 
   WidgetSelectionEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget)
-    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_SELECTION_EVENT)
+    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eSelectionEventClass)
     , mSeqno(kLatestSeqno)
     , mOffset(0)
     , mLength(0)
     , mReversed(false)
     , mExpandToClusterBoundary(true)
     , mSucceeded(false)
     , mUseNativeLineBreak(true)
   {
--- a/widget/shared/WidgetEventImpl.cpp
+++ b/widget/shared/WidgetEventImpl.cpp
@@ -47,17 +47,17 @@ bool
 WidgetEvent::IsQueryContentEvent() const
 {
   return mClass == eQueryContentEventClass;
 }
 
 bool
 WidgetEvent::IsSelectionEvent() const
 {
-  return mClass == NS_SELECTION_EVENT;
+  return mClass == eSelectionEventClass;
 }
 
 bool
 WidgetEvent::IsContentCommandEvent() const
 {
   return mClass == NS_CONTENT_COMMAND_EVENT;
 }
 
@@ -231,17 +231,17 @@ WidgetEvent::IsAllowedToDispatchDOMEvent
       const WidgetWheelEvent* wheelEvent = AsWheelEvent();
       return wheelEvent->deltaX != 0.0 || wheelEvent->deltaY != 0.0 ||
              wheelEvent->deltaZ != 0.0;
     }
 
     // Following events are handled in EventStateManager, so, we don't need to
     // dispatch DOM event for them into the DOM tree.
     case eQueryContentEventClass:
-    case NS_SELECTION_EVENT:
+    case eSelectionEventClass:
     case NS_CONTENT_COMMAND_EVENT:
       return false;
 
     default:
       return true;
   }
 }
 
--- a/widget/xpwidgets/PuppetWidget.cpp
+++ b/widget/xpwidgets/PuppetWidget.cpp
@@ -292,17 +292,17 @@ PuppetWidget::DispatchEvent(WidgetGUIEve
   uint32_t seqno = kLatestSeqno;
   switch (event->mClass) {
   case eCompositionEventClass:
     seqno = event->AsCompositionEvent()->mSeqno;
     break;
   case eTextEventClass:
     seqno = event->AsTextEvent()->mSeqno;
     break;
-  case NS_SELECTION_EVENT:
+  case eSelectionEventClass:
     seqno = event->AsSelectionEvent()->mSeqno;
     break;
   default:
     break;
   }
   if (seqno != kLatestSeqno) {
     mIMELastReceivedSeqno = seqno;
     if (mIMELastReceivedSeqno < mIMELastBlurSeqno) {