Bug 1249915 - Fix missing MOZ_COUNT_CTOR and some misc cleanup. r?karlt draft
authorKartikaya Gupta <kgupta@mozilla.com>
Sun, 21 Feb 2016 13:05:32 -0500
changeset 332795 1ece3ac65f4ed2cdb76d4e3ec80217cdbcaf6775
parent 332794 d49cf4c08ff1a984ffc686a6999eb722cb90c335
child 332796 0248312b5566c84658aa6b7deca3220e11d98a97
push id11237
push userkgupta@mozilla.com
push dateSun, 21 Feb 2016 18:06:13 +0000
reviewerskarlt
bugs1249915
milestone47.0a1
Bug 1249915 - Fix missing MOZ_COUNT_CTOR and some misc cleanup. r?karlt MozReview-Commit-ID: 6vNgIAoUxEi
widget/TouchEvents.h
--- a/widget/TouchEvents.h
+++ b/widget/TouchEvents.h
@@ -78,17 +78,17 @@ public:
     AssignGUIEventData(aEvent, aCopyTargets);
 
     panDirection = aEvent.panDirection;
     displayPanFeedback = aEvent.displayPanFeedback;
   }
 };
 
 /******************************************************************************
- * mozilla::WidgetTouchEvent
+ * mozilla::WidgetSimpleGestureEvent
  ******************************************************************************/
 
 class WidgetSimpleGestureEvent : public WidgetMouseEventBase
 {
 public:
   virtual WidgetSimpleGestureEvent* AsSimpleGestureEvent() override
   {
     return this;
@@ -158,29 +158,30 @@ class WidgetTouchEvent : public WidgetIn
 public:
   typedef nsTArray<RefPtr<mozilla::dom::Touch>> TouchArray;
   typedef AutoTArray<RefPtr<mozilla::dom::Touch>, 10> AutoTouchArray;
 
   virtual WidgetTouchEvent* AsTouchEvent() override { return this; }
 
   WidgetTouchEvent()
   {
+    MOZ_COUNT_CTOR(WidgetTouchEvent);
   }
 
   WidgetTouchEvent(const WidgetTouchEvent& aOther)
     : WidgetInputEvent(aOther.mFlags.mIsTrusted, aOther.mMessage, aOther.widget,
                        eTouchEventClass)
   {
+    MOZ_COUNT_CTOR(WidgetTouchEvent);
     modifiers = aOther.modifiers;
     time = aOther.time;
     timeStamp = aOther.timeStamp;
     touches.AppendElements(aOther.touches);
     mFlags.mCancelable = mMessage != eTouchCancel;
     mFlags.mHandledByAPZ = aOther.mFlags.mHandledByAPZ;
-    MOZ_COUNT_CTOR(WidgetTouchEvent);
   }
 
   WidgetTouchEvent(bool aIsTrusted, EventMessage aMessage, nsIWidget* aWidget)
     : WidgetInputEvent(aIsTrusted, aMessage, aWidget, eTouchEventClass)
   {
     MOZ_COUNT_CTOR(WidgetTouchEvent);
     mFlags.mCancelable = mMessage != eTouchCancel;
   }