Bug 1046101 part.8 Rename NS_QUERY_CONTENT_EVENT to eQueryContentEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:49 +0900
changeset 220546 c9d1559b53209afc90e932335c28a23d7cb8fed8
parent 220545 4e0084fdadf1f7293db2d6c67569126e17009429
child 220547 090872caa52cd2dbd12ed9d27dc10b4549044b57
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.8 Rename NS_QUERY_CONTENT_EVENT to eQueryContentEventClass r=smaug
layout/base/nsLayoutUtils.cpp
widget/BasicEvents.h
widget/TextEvents.h
widget/shared/WidgetEventImpl.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1872,17 +1872,17 @@ nsLayoutUtils::GetEventCoordinatesRelati
   if (!aEvent || (aEvent->mClass != NS_MOUSE_EVENT &&
                   aEvent->mClass != NS_MOUSE_SCROLL_EVENT &&
                   aEvent->mClass != NS_WHEEL_EVENT &&
                   aEvent->mClass != NS_DRAG_EVENT &&
                   aEvent->mClass != NS_SIMPLE_GESTURE_EVENT &&
                   aEvent->mClass != NS_POINTER_EVENT &&
                   aEvent->mClass != NS_GESTURENOTIFY_EVENT &&
                   aEvent->mClass != NS_TOUCH_EVENT &&
-                  aEvent->mClass != NS_QUERY_CONTENT_EVENT))
+                  aEvent->mClass != eQueryContentEventClass))
     return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
 
   return GetEventCoordinatesRelativeTo(aEvent,
            LayoutDeviceIntPoint::ToUntyped(aEvent->AsGUIEvent()->refPoint),
            aFrame);
 }
 
 nsPoint
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -30,17 +30,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   eGUIEventClass,                    // WidgetGUIEvent
   eInputEventClass,                  // WidgetInputEvent
   eUIEventClass,                     // InternalUIEvent
 
   // TextEvents.h
   eKeyboardEventClass,               // WidgetKeyboardEvent
   eCompositionEventClass,            // WidgetCompositionEvent
   eTextEventClass,                   // WidgetTextEvent
-  NS_QUERY_CONTENT_EVENT,            // WidgetQueryContentEvent
+  eQueryContentEventClass,           // WidgetQueryContentEvent
   NS_SELECTION_EVENT,                // 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
--- a/widget/TextEvents.h
+++ b/widget/TextEvents.h
@@ -355,17 +355,17 @@ private:
 public:
   virtual WidgetQueryContentEvent* AsQueryContentEvent() MOZ_OVERRIDE
   {
     return this;
   }
 
   WidgetQueryContentEvent(bool aIsTrusted, uint32_t aMessage,
                           nsIWidget* aWidget)
-    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_QUERY_CONTENT_EVENT)
+    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eQueryContentEventClass)
     , mSucceeded(false)
     , mWasAsync(false)
     , mUseNativeLineBreak(true)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
--- a/widget/shared/WidgetEventImpl.cpp
+++ b/widget/shared/WidgetEventImpl.cpp
@@ -41,17 +41,17 @@ WidgetEvent::As##aName() const \
  * mozilla::WidgetEvent
  *
  * Event struct type checking methods.
  ******************************************************************************/
 
 bool
 WidgetEvent::IsQueryContentEvent() const
 {
-  return mClass == NS_QUERY_CONTENT_EVENT;
+  return mClass == eQueryContentEventClass;
 }
 
 bool
 WidgetEvent::IsSelectionEvent() const
 {
   return mClass == NS_SELECTION_EVENT;
 }
 
@@ -230,17 +230,17 @@ WidgetEvent::IsAllowedToDispatchDOMEvent
       // shouldn't cause a DOM event.
       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 NS_QUERY_CONTENT_EVENT:
+    case eQueryContentEventClass:
     case NS_SELECTION_EVENT:
     case NS_CONTENT_COMMAND_EVENT:
       return false;
 
     default:
       return true;
   }
 }