From 3b4aa2e726f0bbab8c5162ec3851468d3b87957d Mon Sep 17 00:00:00 2001 From: Boris Chiou Date: Tue, 12 Jul 2016 18:05:48 +0800 Subject: [PATCH] Bug 1049975 - Part 2: Make effect writable in Animation.webidl. r=smaug MozReview-Commit-ID: HB4iWPXGkou --HG-- extra : rebase_source : a2c5053aeb25872af66ea9b609b0ac05cdf96c85 --- dom/animation/Animation.h | 4 ++++ dom/webidl/Animation.webidl | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h index a73051667274..15a9ee896b1f 100644 --- a/dom/animation/Animation.h +++ b/dom/animation/Animation.h @@ -98,6 +98,10 @@ public: void GetId(nsAString& aResult) const { aResult = mId; } void SetId(const nsAString& aId); KeyframeEffectReadOnly* GetEffect() const { return mEffect; } + void SetEffect(AnimationEffectReadOnly* aEffect) + { + // TODO: Merged with SetEffect(KeyframeEffectReadOnly*) in the next patch. + } void SetEffect(KeyframeEffectReadOnly* aEffect); AnimationTimeline* GetTimeline() const { return mTimeline; } void SetTimeline(AnimationTimeline* aTimeline); diff --git a/dom/webidl/Animation.webidl b/dom/webidl/Animation.webidl index 9f26ca288b07..0bcde49af6a7 100644 --- a/dom/webidl/Animation.webidl +++ b/dom/webidl/Animation.webidl @@ -17,9 +17,8 @@ enum AnimationPlayState { "idle", "pending", "running", "paused", "finished" }; optional AnimationTimeline? timeline)] interface Animation : EventTarget { attribute DOMString id; - // Bug 1049975: Make 'effect' writeable [Func="nsDocument::IsWebAnimationsEnabled", Pure] - readonly attribute AnimationEffectReadOnly? effect; + attribute AnimationEffectReadOnly? effect; [Func="nsDocument::IsWebAnimationsEnabled"] attribute AnimationTimeline? timeline; [BinaryName="startTimeAsDouble"]