Backed out changeset 6ab8497cb00f (bug 847599)
authorEd Morley <emorley@mozilla.com>
Thu, 14 Mar 2013 13:23:32 +0000
changeset 124803 44810fa6c3122477c8f8ec2061c536f0caa39216
parent 124802 630d841daf46397e796c7fa30f6cee92a8f672ac
child 124804 9f128f1af70646b955fc0f9d80b8dad8f816af20
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs847599
milestone22.0a1
backs out6ab8497cb00fcf154e9d215b5a9af7477cec9cfd
Backed out changeset 6ab8497cb00f (bug 847599)
content/events/src/nsDOMTransitionEvent.cpp
content/events/src/nsDOMTransitionEvent.h
dom/bindings/Bindings.conf
dom/webidl/TransitionEvent.webidl
dom/webidl/WebIDL.mk
--- a/content/events/src/nsDOMTransitionEvent.cpp
+++ b/content/events/src/nsDOMTransitionEvent.cpp
@@ -19,17 +19,16 @@ nsDOMTransitionEvent::nsDOMTransitionEve
 {
   if (aEvent) {
     mEventIsInternal = false;
   }
   else {
     mEventIsInternal = true;
     mEvent->time = PR_Now();
   }
-  SetIsDOMBinding();
 }
 
 nsDOMTransitionEvent::~nsDOMTransitionEvent()
 {
   if (mEventIsInternal) {
     delete TransitionEvent();
     mEvent = nullptr;
   }
@@ -50,17 +49,17 @@ nsDOMTransitionEvent::GetPropertyName(ns
 {
   aPropertyName = TransitionEvent()->propertyName;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTransitionEvent::GetElapsedTime(float *aElapsedTime)
 {
-  *aElapsedTime = ElapsedTime();
+  *aElapsedTime = TransitionEvent()->elapsedTime;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTransitionEvent::InitTransitionEvent(const nsAString & typeArg,
                                           bool canBubbleArg,
                                           bool cancelableArg,
                                           const nsAString & propertyNameArg,
--- a/content/events/src/nsDOMTransitionEvent.h
+++ b/content/events/src/nsDOMTransitionEvent.h
@@ -3,56 +3,32 @@
  * 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/. */
 #ifndef nsDOMTransitionEvent_h_
 #define nsDOMTransitionEvent_h_
 
 #include "nsDOMEvent.h"
 #include "nsIDOMTransitionEvent.h"
 #include "nsString.h"
-#include "mozilla/dom/TransitionEventBinding.h"
 
 class nsTransitionEvent;
 
 class nsDOMTransitionEvent : public nsDOMEvent,
                              public nsIDOMTransitionEvent
 {
 public:
   nsDOMTransitionEvent(mozilla::dom::EventTarget* aOwner,
                        nsPresContext *aPresContext,
                        nsTransitionEvent *aEvent);
   ~nsDOMTransitionEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_FORWARD_TO_NSDOMEVENT
   NS_DECL_NSIDOMTRANSITIONEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
-  {
-    return mozilla::dom::TransitionEventBinding::Wrap(aCx, aScope, this);
-  }
-
-  // xpidl implementation
-  // GetPropertyName(nsAString& aPropertyName)
-
-  float ElapsedTime()
-  {
-    return TransitionEvent()->elapsedTime;
-  }
-
-  void InitTransitionEvent(const nsAString& aType,
-                           bool aCanBubble,
-                           bool aCancelable,
-                           const nsAString& aPropertyName,
-                           float aElapsedTime,
-                           mozilla::ErrorResult& aRv)
-  {
-    aRv = InitTransitionEvent(aType, aCanBubble, aCancelable, aPropertyName,
-                              aElapsedTime);
-  }
 private:
   nsTransitionEvent* TransitionEvent() {
     NS_ABORT_IF_FALSE(mEvent->eventStructType == NS_TRANSITION_EVENT,
                       "unexpected struct type");
     return static_cast<nsTransitionEvent*>(mEvent);
   }
 };
 
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -870,20 +870,16 @@ DOMInterfaces = {
     'workers': True,
     'implicitJSContext': [ 'encode' ],
 }],
 
 'TimeRanges': {
     'wrapperCache': False
 },
 
-'TransitionEvent': {
-    'nativeType': 'nsDOMTransitionEvent',
-},
-
 'TreeWalker': {
     'wrapperCache': False,
     'resultNotAddRefed': [ 'root', 'currentNode' ],
 },
 
 'UIEvent': {
     'nativeType': 'nsDOMUIEvent',
 },
deleted file mode 100644
--- a/dom/webidl/TransitionEvent.webidl
+++ /dev/null
@@ -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/.
- *
- * Transition events are defined in:
- * http://www.w3.org/TR/css3-transitions/#transition-events-
- * http://dev.w3.org/csswg/css3-transitions/#transition-events-
- *
- * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-interface TransitionEvent : Event {
-  readonly attribute DOMString propertyName;
-  readonly attribute float     elapsedTime;
-
-  [Throws]
-  void initTransitionEvent(DOMString aType,
-                           boolean aCanBubble,
-                           boolean aCancelable,
-                           DOMString aPropertyName,
-                           float aElapsedTime);
-};
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -224,17 +224,16 @@ webidl_files = \
   SVGUseElement.webidl \
   SVGURIReference.webidl \
   SVGViewElement.webidl \
   SVGZoomAndPan.webidl \
   Text.webidl \
   TextDecoder.webidl \
   TextEncoder.webidl \
   TimeRanges.webidl \
-  TransitionEvent.webidl \
   TreeWalker.webidl \
   UIEvent.webidl \
   URL.webidl \
   ValidityState.webidl \
   WebComponents.webidl \
   WebSocket.webidl \
   UndoManager.webidl \
   URLUtils.webidl \