Backed out changeset 46ba7eb77ae1 (bug 847589) for crashes on a CLOSED TREE

content/events/src/nsDOMAnimationEvent.cpp

@@ -24,7 +24,6 @@ nsDOMAnimationEvent::nsDOMAnimationEvent(mozilla::dom::EventTarget* aOwner,
     mEventIsInternal = true;
     mEvent->time = PR_Now();
   }
-  SetIsDOMBinding();
 }
 
 nsDOMAnimationEvent::~nsDOMAnimationEvent()
@@ -55,7 +54,7 @@ nsDOMAnimationEvent::GetAnimationName(nsAString & aAnimationName)
 NS_IMETHODIMP
 nsDOMAnimationEvent::GetElapsedTime(float *aElapsedTime)
 {
-  *aElapsedTime = ElapsedTime();
+  *aElapsedTime = AnimationEvent()->elapsedTime;
   return NS_OK;
 }
 

content/events/src/nsDOMAnimationEvent.h

@@ -8,7 +8,6 @@
 #include "nsDOMEvent.h"
 #include "nsIDOMAnimationEvent.h"
 #include "nsString.h"
-#include "mozilla/dom/AnimationEventBinding.h"
 
 class nsAnimationEvent;
 
@@ -25,29 +24,6 @@ public:
   NS_FORWARD_TO_NSDOMEVENT
   NS_DECL_NSIDOMANIMATIONEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
-  {
-    return mozilla::dom::AnimationEventBinding::Wrap(aCx, aScope, this);
-  }
-
-  // xpidl implementation
-  // GetAnimationName(nsAString& aAnimationName);
-
-  float ElapsedTime()
-  {
-    return AnimationEvent()->elapsedTime;
-  }
-
-  void InitAnimationEvent(const nsAString& aType,
-                          bool aCanBubble,
-                          bool aCancelable,
-                          const nsAString& aAnimationName,
-                          float aElapsedTime,
-                          mozilla::ErrorResult& aRv)
-  {
-    aRv = InitAnimationEvent(aType, aCanBubble, aCancelable, aAnimationName,
-                             aElapsedTime);
-  }
 private:
   nsAnimationEvent* AnimationEvent() {
     NS_ABORT_IF_FALSE(mEvent->eventStructType == NS_ANIMATION_EVENT,

dom/bindings/Bindings.conf

@@ -78,10 +78,6 @@
 
 DOMInterfaces = {
 
-'AnimationEvent': {
-    'nativeType': 'nsDOMAnimationEvent',
-},
-
 'ArchiveReader': {
     'nativeType': 'mozilla::dom::file::ArchiveReader',
 },

dom/webidl/AnimationEvent.webidl

@@ -1,24 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * The origin of this IDL file is
- * http://www.w3.org/TR/css3-animations/#animation-events-
- * http://dev.w3.org/csswg/css3-animations/#animation-events-
- *
- * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-interface AnimationEvent : Event {
-  readonly attribute DOMString animationName;
-  readonly attribute float     elapsedTime;
-
-  [Throws]
-  void initAnimationEvent(DOMString type,
-                          boolean canBubble,
-                          boolean cancelable,
-                          DOMString animationName,
-                          float elapsedTime);
-};

dom/webidl/WebIDL.mk

@@ -9,7 +9,6 @@ generated_webidl_files = \
   $(NULL)
 
 webidl_files = \
-  AnimationEvent.webidl \
   ArchiveReader.webidl \
   AudioBuffer.webidl \
   AudioBufferSourceNode.webidl \