Backed out changeset 1e1ccffd51b8 (bug 1178186) for suspicion of causing bc2 test failures on OSX browser_bug427559.js

dom/animation/Animation.h

@@ -40,11 +40,11 @@ class AnimValuesStyleRule;
 class CommonAnimationManager;
 } // namespace css
 
-namespace dom {
-
 class CSSAnimation;
 class CSSTransition;
 
+namespace dom {
+
 class Animation
   : public nsISupports
   , public nsWrapperCache

dom/tests/mochitest/general/test_interfaces.html

@@ -298,8 +298,6 @@ var interfaceNamesInGlobalScope =
     "CSS",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "CSS2Properties",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "CSSAnimation", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "CSSConditionRule",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -336,8 +334,6 @@ var interfaceNamesInGlobalScope =
     "CSSStyleSheet",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "CSSSupportsRule",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "CSSTransition", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "CSSValue",
 // IMPORTANT: Do not change this list without review from a DOM peer!

dom/webidl/CSSAnimation.webidl

@@ -1,16 +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://dev.w3.org/csswg/css-animations-2/#the-CSSAnimation-interface
- *
- * Copyright © 2015 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-[Func="nsDocument::IsWebAnimationsEnabled",
- HeaderFile="nsAnimationManager.h"]
-interface CSSAnimation : Animation {
-};

dom/webidl/CSSTransition.webidl

@@ -1,16 +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://dev.w3.org/csswg/css-transitions-2/#the-CSSTransition-interface
- *
- * Copyright © 2015 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-[Func="nsDocument::IsWebAnimationsEnabled",
- HeaderFile="nsTransitionManager.h"]
-interface CSSTransition : Animation {
-};

dom/webidl/moz.build

@@ -91,13 +91,11 @@ WEBIDL_FILES = [
     'CSPDictionaries.webidl',
     'CSPReport.webidl',
     'CSS.webidl',
-    'CSSAnimation.webidl',
     'CSSLexer.webidl',
     'CSSPrimitiveValue.webidl',
     'CSSRuleList.webidl',
     'CSSStyleDeclaration.webidl',
     'CSSStyleSheet.webidl',
-    'CSSTransition.webidl',
     'CSSValue.webidl',
     'CSSValueList.webidl',
     'DataContainerEvent.webidl',

layout/style/nsAnimationManager.cpp

@@ -5,7 +5,6 @@
 
 #include "nsAnimationManager.h"
 #include "nsTransitionManager.h"
-#include "mozilla/dom/CSSAnimationBinding.h"
 
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/MemoryReporting.h"
@@ -28,13 +27,7 @@ using namespace mozilla::css;
 using mozilla::dom::Animation;
 using mozilla::dom::AnimationPlayState;
 using mozilla::dom::KeyframeEffectReadOnly;
-using mozilla::dom::CSSAnimation;
-
-JSObject*
-CSSAnimation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
-{
-  return dom::CSSAnimationBinding::Wrap(aCx, this, aGivenProto);
-}
+using mozilla::CSSAnimation;
 
 mozilla::dom::Promise*
 CSSAnimation::GetReady(ErrorResult& aRv)

layout/style/nsAnimationManager.h

@@ -51,29 +51,24 @@ struct AnimationEventInfo {
 
 typedef InfallibleTArray<AnimationEventInfo> EventArray;
 
-namespace dom {
-
-class CSSAnimation final : public Animation
+class CSSAnimation final : public dom::Animation
 {
 public:
- explicit CSSAnimation(DocumentTimeline* aTimeline)
-    : Animation(aTimeline)
+ explicit CSSAnimation(dom::DocumentTimeline* aTimeline)
+    : dom::Animation(aTimeline)
     , mIsStylePaused(false)
     , mPauseShouldStick(false)
     , mPreviousPhaseOrIteration(PREVIOUS_PHASE_BEFORE)
   {
   }
 
-  JSObject* WrapObject(JSContext* aCx,
-                       JS::Handle<JSObject*> aGivenProto) override;
-
   virtual CSSAnimation* AsCSSAnimation() override { return this; }
 
-  virtual Promise* GetReady(ErrorResult& aRv) override;
+  virtual dom::Promise* GetReady(ErrorResult& aRv) override;
   virtual void Play(ErrorResult& aRv, LimitBehavior aLimitBehavior) override;
   virtual void Pause(ErrorResult& aRv) override;
 
-  virtual AnimationPlayState PlayStateFromJS() const override;
+  virtual dom::AnimationPlayState PlayStateFromJS() const override;
   virtual void PlayFromJS(ErrorResult& aRv) override;
 
   void PlayFromStyle();
@@ -157,7 +152,6 @@ protected:
   uint64_t mPreviousPhaseOrIteration;
 };
 
-} /* namespace dom */
 } /* namespace mozilla */
 
 class nsAnimationManager final

layout/style/nsTransitionManager.cpp

@@ -8,8 +8,6 @@
 
 #include "nsTransitionManager.h"
 #include "nsAnimationManager.h"
-#include "mozilla/dom/CSSTransitionBinding.h"
-
 #include "nsIContent.h"
 #include "nsStyleContext.h"
 #include "nsCSSProps.h"
@@ -87,13 +85,7 @@ ElementPropertyTransition::CurrentValuePortion() const
  * CSSTransition                                                             *
  *****************************************************************************/
 
-JSObject*
-CSSTransition::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
-{
-  return dom::CSSTransitionBinding::Wrap(aCx, this, aGivenProto);
-}
-
-AnimationPlayState
+mozilla::dom::AnimationPlayState
 CSSTransition::PlayStateFromJS() const
 {
   FlushStyle();

layout/style/nsTransitionManager.h

@@ -74,22 +74,17 @@ struct ElementPropertyTransition : public dom::KeyframeEffectReadOnly
   double CurrentValuePortion() const;
 };
 
-namespace dom {
-
-class CSSTransition final : public Animation
+class CSSTransition final : public dom::Animation
 {
 public:
- explicit CSSTransition(DocumentTimeline* aTimeline)
-    : Animation(aTimeline)
+ explicit CSSTransition(dom::DocumentTimeline* aTimeline)
+    : dom::Animation(aTimeline)
   {
   }
 
-  JSObject* WrapObject(JSContext* aCx,
-                       JS::Handle<JSObject*> aGivenProto) override;
-
   virtual CSSTransition* AsCSSTransition() override { return this; }
 
-  virtual AnimationPlayState PlayStateFromJS() const override;
+  virtual dom::AnimationPlayState PlayStateFromJS() const override;
   virtual void PlayFromJS(ErrorResult& aRv) override;
 
   // A variant of Play() that avoids posting style updates since this method
@@ -108,7 +103,6 @@ protected:
   virtual css::CommonAnimationManager* GetAnimationManager() const override;
 };
 
-} // namespace dom
 } // namespace mozilla
 
 class nsTransitionManager final