Bug 920425 part.10 Use mozilla::WidgetEvent::AsTransitionEvent() r=smaug

content/events/src/nsDOMEvent.cpp

@@ -712,8 +712,7 @@ nsDOMEvent::DuplicatePrivateData()
     }
     case NS_TRANSITION_EVENT:
     {
-      InternalTransitionEvent* oldTransitionEvent =
-        static_cast<InternalTransitionEvent*>(mEvent);
+      InternalTransitionEvent* oldTransitionEvent = mEvent->AsTransitionEvent();
       InternalTransitionEvent* transitionEvent =
          new InternalTransitionEvent(false, msg,
                                      oldTransitionEvent->propertyName,

content/events/src/nsDOMTransitionEvent.cpp

@@ -46,9 +46,10 @@ nsDOMTransitionEvent::Constructor(const mozilla::dom::GlobalObject& aGlobal,
 
   aRv = e->InitEvent(aType, aParam.mBubbles, aParam.mCancelable);
 
-  e->TransitionEvent()->propertyName = aParam.mPropertyName;
-  e->TransitionEvent()->elapsedTime = aParam.mElapsedTime;
-  e->TransitionEvent()->pseudoElement = aParam.mPseudoElement;
+  InternalTransitionEvent* internalEvent = e->mEvent->AsTransitionEvent();
+  internalEvent->propertyName = aParam.mPropertyName;
+  internalEvent->elapsedTime = aParam.mElapsedTime;
+  internalEvent->pseudoElement = aParam.mPseudoElement;
 
   e->SetTrusted(trusted);
   return e.forget();
@@ -57,7 +58,7 @@ nsDOMTransitionEvent::Constructor(const mozilla::dom::GlobalObject& aGlobal,
 NS_IMETHODIMP
 nsDOMTransitionEvent::GetPropertyName(nsAString & aPropertyName)
 {
-  aPropertyName = TransitionEvent()->propertyName;
+  aPropertyName = mEvent->AsTransitionEvent()->propertyName;
   return NS_OK;
 }
 
@@ -68,10 +69,16 @@ nsDOMTransitionEvent::GetElapsedTime(float *aElapsedTime)
   return NS_OK;
 }
 
+float
+nsDOMTransitionEvent::ElapsedTime()
+{
+  return mEvent->AsTransitionEvent()->elapsedTime;
+}
+
 NS_IMETHODIMP
 nsDOMTransitionEvent::GetPseudoElement(nsAString& aPseudoElement)
 {
-  aPseudoElement = TransitionEvent()->pseudoElement;
+  aPseudoElement = mEvent->AsTransitionEvent()->pseudoElement;
   return NS_OK;
 }
 

content/events/src/nsDOMTransitionEvent.h

@@ -7,7 +7,7 @@
 
 #include "nsDOMEvent.h"
 #include "nsIDOMTransitionEvent.h"
-#include "mozilla/ContentEvents.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/TransitionEventBinding.h"
 
 class nsAString;
@@ -40,17 +40,7 @@ public:
   // GetPropertyName(nsAString& aPropertyName)
   // GetPseudoElement(nsAString& aPreudoElement)
 
-  float ElapsedTime()
-  {
-    return TransitionEvent()->elapsedTime;
-  }
-
-private:
-  mozilla::InternalTransitionEvent* TransitionEvent() {
-    NS_ABORT_IF_FALSE(mEvent->eventStructType == NS_TRANSITION_EVENT,
-                      "unexpected struct type");
-    return static_cast<mozilla::InternalTransitionEvent*>(mEvent);
-  }
+  float ElapsedTime();
 };
 
 #endif /* !defined(nsDOMTransitionEvent_h_) */

content/events/src/nsEventDispatcher.cpp

@@ -746,7 +746,7 @@ nsEventDispatcher::CreateEvent(mozilla::dom::EventTarget* aOwner,
                                  static_cast<WidgetTouchEvent*>(aEvent));
     case NS_TRANSITION_EVENT:
       return NS_NewDOMTransitionEvent(aDOMEvent, aOwner, aPresContext,
-               static_cast<InternalTransitionEvent*>(aEvent));
+                                      aEvent->AsTransitionEvent());
     case NS_ANIMATION_EVENT:
       return NS_NewDOMAnimationEvent(aDOMEvent, aOwner, aPresContext,
                static_cast<InternalAnimationEvent*>(aEvent));