Bug 920425 part.3 We don't need to use static_cast at releasing event class instance since WidgetEvent has virtual destructor now r=smaug

content/events/src/DOMWheelEvent.cpp

@@ -29,16 +29,6 @@ DOMWheelEvent::DOMWheelEvent(EventTarget* aOwner,
   }
 }
 
-DOMWheelEvent::~DOMWheelEvent()
-{
-  if (mEventIsInternal && mEvent) {
-    MOZ_ASSERT(mEvent->eventStructType == NS_WHEEL_EVENT,
-               "The mEvent must be WidgetWheelEvent");
-    delete static_cast<WidgetWheelEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(DOMWheelEvent, nsDOMMouseEvent)
 NS_IMPL_RELEASE_INHERITED(DOMWheelEvent, nsDOMMouseEvent)
 

content/events/src/DOMWheelEvent.h

@@ -22,7 +22,6 @@ public:
   DOMWheelEvent(mozilla::dom::EventTarget* aOwner,
                 nsPresContext* aPresContext,
                 WidgetWheelEvent* aWheelEvent);
-  virtual ~DOMWheelEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMAnimationEvent.cpp

@@ -26,14 +26,6 @@ nsDOMAnimationEvent::nsDOMAnimationEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMAnimationEvent::~nsDOMAnimationEvent()
-{
-  if (mEventIsInternal) {
-    delete AnimationEvent();
-    mEvent = nullptr;
-  }
-}
-
 NS_INTERFACE_MAP_BEGIN(nsDOMAnimationEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMAnimationEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)

content/events/src/nsDOMAnimationEvent.h

@@ -19,7 +19,6 @@ public:
   nsDOMAnimationEvent(mozilla::dom::EventTarget* aOwner,
                       nsPresContext *aPresContext,
                       mozilla::InternalAnimationEvent* aEvent);
-  ~nsDOMAnimationEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_FORWARD_TO_NSDOMEVENT

content/events/src/nsDOMClipboardEvent.cpp

@@ -24,14 +24,6 @@ nsDOMClipboardEvent::nsDOMClipboardEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMClipboardEvent::~nsDOMClipboardEvent()
-{
-  if (mEventIsInternal && mEvent->eventStructType == NS_CLIPBOARD_EVENT) {
-    delete static_cast<InternalClipboardEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_INTERFACE_MAP_BEGIN(nsDOMClipboardEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMClipboardEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)

content/events/src/nsDOMClipboardEvent.h

@@ -18,7 +18,6 @@ public:
   nsDOMClipboardEvent(mozilla::dom::EventTarget* aOwner,
                       nsPresContext* aPresContext,
                       mozilla::InternalClipboardEvent* aEvent);
-  virtual ~nsDOMClipboardEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMCommandEvent.cpp

@@ -23,14 +23,6 @@ nsDOMCommandEvent::nsDOMCommandEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMCommandEvent::~nsDOMCommandEvent()
-{
-  if (mEventIsInternal && mEvent->eventStructType == NS_COMMAND_EVENT) {
-    delete static_cast<WidgetCommandEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_INTERFACE_MAP_BEGIN(nsDOMCommandEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCommandEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)

content/events/src/nsDOMCommandEvent.h

@@ -18,7 +18,6 @@ public:
   nsDOMCommandEvent(mozilla::dom::EventTarget* aOwner,
                     nsPresContext* aPresContext,
                     mozilla::WidgetCommandEvent* aEvent);
-  virtual ~nsDOMCommandEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMCompositionEvent.cpp

@@ -35,14 +35,6 @@ nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
   // TODO: Native event should have locale information.
 }
 
-nsDOMCompositionEvent::~nsDOMCompositionEvent()
-{
-  if (mEventIsInternal) {
-    delete static_cast<WidgetCompositionEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMCompositionEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMCompositionEvent, nsDOMUIEvent)
 

content/events/src/nsDOMCompositionEvent.h

@@ -19,7 +19,6 @@ public:
   nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
                         nsPresContext* aPresContext,
                         mozilla::WidgetCompositionEvent* aEvent);
-  virtual ~nsDOMCompositionEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_FORWARD_TO_NSDOMUIEVENT

content/events/src/nsDOMDragEvent.cpp

@@ -29,15 +29,6 @@ nsDOMDragEvent::nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMDragEvent::~nsDOMDragEvent()
-{
-  if (mEventIsInternal) {
-    if (mEvent->eventStructType == NS_DRAG_EVENT)
-      delete static_cast<WidgetDragEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMDragEvent, nsDOMMouseEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMDragEvent, nsDOMMouseEvent)
 

content/events/src/nsDOMDragEvent.h

@@ -18,7 +18,6 @@ public:
   nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
                  nsPresContext* aPresContext,
                  mozilla::WidgetInputEvent* aEvent);
-  virtual ~nsDOMDragEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMFocusEvent.cpp

@@ -27,14 +27,6 @@ nsDOMFocusEvent::nsDOMFocusEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMFocusEvent::~nsDOMFocusEvent()
-{
-  if (mEventIsInternal && mEvent) {
-    delete static_cast<InternalFocusEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 /* readonly attribute nsIDOMEventTarget relatedTarget; */
 NS_IMETHODIMP
 nsDOMFocusEvent::GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget)

content/events/src/nsDOMFocusEvent.h

@@ -43,7 +43,6 @@ protected:
                           nsIDOMWindow* aView,
                           int32_t aDetail,
                           mozilla::dom::EventTarget* aRelatedTarget);
-  ~nsDOMFocusEvent();
 };
 
 #endif /* !defined(nsDOMFocusEvent_h_) */

content/events/src/nsDOMKeyboardEvent.cpp

@@ -26,14 +26,6 @@ nsDOMKeyboardEvent::nsDOMKeyboardEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMKeyboardEvent::~nsDOMKeyboardEvent()
-{
-  if (mEventIsInternal) {
-    delete static_cast<WidgetKeyboardEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMKeyboardEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMKeyboardEvent, nsDOMUIEvent)
 

content/events/src/nsDOMKeyboardEvent.h

@@ -19,7 +19,6 @@ public:
   nsDOMKeyboardEvent(mozilla::dom::EventTarget* aOwner,
                      nsPresContext* aPresContext,
                      mozilla::WidgetKeyboardEvent* aEvent);
-  virtual ~nsDOMKeyboardEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMMouseEvent.cpp

@@ -46,22 +46,6 @@ nsDOMMouseEvent::nsDOMMouseEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMMouseEvent::~nsDOMMouseEvent()
-{
-  if (mEventIsInternal && mEvent) {
-    switch (mEvent->eventStructType)
-    {
-      case NS_MOUSE_EVENT:
-        delete static_cast<WidgetMouseEvent*>(mEvent);
-        break;
-      default:
-        delete mEvent;
-        break;
-    }
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMMouseEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMMouseEvent, nsDOMUIEvent)
 

content/events/src/nsDOMMouseEvent.h

@@ -18,7 +18,6 @@ public:
   nsDOMMouseEvent(mozilla::dom::EventTarget* aOwner,
                   nsPresContext* aPresContext,
                   mozilla::WidgetInputEvent* aEvent);
-  virtual ~nsDOMMouseEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMMouseScrollEvent.cpp

@@ -31,22 +31,6 @@ nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMMouseScrollEvent::~nsDOMMouseScrollEvent()
-{
-  if (mEventIsInternal && mEvent) {
-    switch (mEvent->eventStructType)
-    {
-      case NS_MOUSE_SCROLL_EVENT:
-        delete static_cast<WidgetMouseScrollEvent*>(mEvent);
-        break;
-      default:
-        delete mEvent;
-        break;
-    }
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMMouseScrollEvent, nsDOMMouseEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMMouseScrollEvent, nsDOMMouseEvent)
 

content/events/src/nsDOMMouseScrollEvent.h

@@ -17,7 +17,6 @@ public:
   nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
                         nsPresContext* aPresContext,
                         mozilla::WidgetInputEvent* aEvent);
-  virtual ~nsDOMMouseScrollEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMMutationEvent.cpp

@@ -20,16 +20,6 @@ nsDOMMutationEvent::nsDOMMutationEvent(mozilla::dom::EventTarget* aOwner,
   mEventIsInternal = (aEvent == nullptr);
 }
 
-nsDOMMutationEvent::~nsDOMMutationEvent()
-{
-  if (mEventIsInternal) {
-    InternalMutationEvent* mutation =
-      static_cast<InternalMutationEvent*>(mEvent);
-    delete mutation;
-    mEvent = nullptr;
-  }
-}
-
 NS_INTERFACE_MAP_BEGIN(nsDOMMutationEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMutationEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)

content/events/src/nsDOMMutationEvent.h

@@ -20,8 +20,6 @@ public:
                      nsPresContext* aPresContext,
                      mozilla::InternalMutationEvent* aEvent);
 
-  virtual ~nsDOMMutationEvent();
-
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_DECL_NSIDOMMUTATIONEVENT

content/events/src/nsDOMScrollAreaEvent.cpp

@@ -21,16 +21,6 @@ nsDOMScrollAreaEvent::nsDOMScrollAreaEvent(mozilla::dom::EventTarget* aOwner,
   mClientArea.SetLayoutRect(aEvent ? aEvent->mArea : nsRect());
 }
 
-nsDOMScrollAreaEvent::~nsDOMScrollAreaEvent()
-{
-  if (mEventIsInternal && mEvent) {
-    if (mEvent->eventStructType == NS_SCROLLAREA_EVENT) {
-      delete static_cast<InternalScrollAreaEvent*>(mEvent);
-      mEvent = nullptr;
-    }
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMScrollAreaEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMScrollAreaEvent, nsDOMUIEvent)
 

content/events/src/nsDOMScrollAreaEvent.h

@@ -23,7 +23,6 @@ public:
   nsDOMScrollAreaEvent(mozilla::dom::EventTarget* aOwner,
                        nsPresContext *aPresContext,
                        mozilla::InternalScrollAreaEvent* aEvent);
-  virtual ~nsDOMScrollAreaEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMSimpleGestureEvent.cpp

@@ -30,14 +30,6 @@ nsDOMSimpleGestureEvent::nsDOMSimpleGestureEvent(mozilla::dom::EventTarget* aOwn
   }
 }
 
-nsDOMSimpleGestureEvent::~nsDOMSimpleGestureEvent()
-{
-  if (mEventIsInternal) {
-    delete static_cast<WidgetSimpleGestureEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_ADDREF_INHERITED(nsDOMSimpleGestureEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMSimpleGestureEvent, nsDOMUIEvent)
 

content/events/src/nsDOMSimpleGestureEvent.h

@@ -18,7 +18,6 @@ class nsDOMSimpleGestureEvent : public nsDOMMouseEvent,
 public:
   nsDOMSimpleGestureEvent(mozilla::dom::EventTarget* aOwner,
                           nsPresContext*, mozilla::WidgetSimpleGestureEvent*);
-  virtual ~nsDOMSimpleGestureEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMTouchEvent.cpp

@@ -71,14 +71,6 @@ nsDOMTouchEvent::nsDOMTouchEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMTouchEvent::~nsDOMTouchEvent()
-{
-  if (mEventIsInternal && mEvent) {
-    delete static_cast<WidgetTouchEvent*>(mEvent);
-    mEvent = nullptr;
-  }
-}
-
 NS_IMPL_CYCLE_COLLECTION_INHERITED_3(nsDOMTouchEvent, nsDOMUIEvent,
                                      mTouches,
                                      mTargetTouches,

content/events/src/nsDOMTouchEvent.h

@@ -84,7 +84,6 @@ public:
   nsDOMTouchEvent(mozilla::dom::EventTarget* aOwner,
                   nsPresContext* aPresContext,
                   mozilla::WidgetTouchEvent* aEvent);
-  virtual ~nsDOMTouchEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMTouchEvent, nsDOMUIEvent)

content/events/src/nsDOMTransitionEvent.cpp

@@ -26,14 +26,6 @@ nsDOMTransitionEvent::nsDOMTransitionEvent(mozilla::dom::EventTarget* aOwner,
   }
 }
 
-nsDOMTransitionEvent::~nsDOMTransitionEvent()
-{
-  if (mEventIsInternal) {
-    delete TransitionEvent();
-    mEvent = nullptr;
-  }
-}
-
 NS_INTERFACE_MAP_BEGIN(nsDOMTransitionEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMTransitionEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)

content/events/src/nsDOMTransitionEvent.h

@@ -19,7 +19,6 @@ public:
   nsDOMTransitionEvent(mozilla::dom::EventTarget* aOwner,
                        nsPresContext *aPresContext,
                        mozilla::InternalTransitionEvent* aEvent);
-  ~nsDOMTransitionEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_FORWARD_TO_NSDOMEVENT

layout/base/nsPresShell.h

@@ -570,6 +570,11 @@ protected:
     nsDelayedInputEvent()
     : nsDelayedEvent(), mEvent(nullptr) {}
 
+    virtual ~nsDelayedInputEvent()
+    {
+      delete mEvent;
+    }
+
     mozilla::WidgetInputEvent* mEvent;
   };
 
@@ -587,11 +592,6 @@ protected:
       static_cast<mozilla::WidgetMouseEvent*>(mEvent)->
         AssignMouseEventData(*aEvent, false);
     }
-
-    virtual ~nsDelayedMouseEvent()
-    {
-      delete static_cast<mozilla::WidgetMouseEvent*>(mEvent);
-    }
   };
 
   class nsDelayedKeyEvent : public nsDelayedInputEvent
@@ -606,11 +606,6 @@ protected:
       static_cast<mozilla::WidgetKeyboardEvent*>(mEvent)->
         AssignKeyEventData(*aEvent, false);
     }
-
-    virtual ~nsDelayedKeyEvent()
-    {
-      delete static_cast<mozilla::WidgetKeyboardEvent*>(mEvent);
-    }
   };
 
   // Check if aEvent is a mouse event and record the mouse location for later