Bug 1284396 - Change GetParentObject return value. r?birtles draft
authorMantaroh Yoshinaga <mantaroh@gmail.com>
Wed, 06 Jul 2016 09:20:29 +0900
changeset 384335 b16868851da33cf67c01bbc4d75887befb9e7ab1
parent 384253 9b428173a0889f5a25e7a6e855f2d1726207a723
child 524679 de7907ff14d0ee355f8f649801107de86043d739
push id22244
push usermantaroh@gmail.com
push dateWed, 06 Jul 2016 02:58:01 +0000
reviewersbirtles
bugs1284396
milestone50.0a1
Bug 1284396 - Change GetParentObject return value. r?birtles MozReview-Commit-ID: Rw0i2y4cc
dom/animation/Animation.h
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -64,17 +64,17 @@ public:
     , mFinishedIsResolved(false)
   {
   }
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(Animation,
                                            DOMEventTargetHelper)
 
-  AnimationTimeline* GetParentObject() const { return mTimeline; }
+  nsIGlobalObject* GetParentObject() const { return GetOwnerGlobal(); }
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aGivenProto) override;
 
   virtual CSSAnimation* AsCSSAnimation() { return nullptr; }
   virtual const CSSAnimation* AsCSSAnimation() const { return nullptr; }
   virtual CSSTransition* AsCSSTransition() { return nullptr; }
   virtual const CSSTransition* AsCSSTransition() const { return nullptr; }