Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1456394 - Rename animation timing dictionaries; r=bz

Browse Source 
As per the changes in:

  d4519d9bba (diff-4c9f5c055fb219a7fcad23a9a7a80b64R4206)

MozReview-Commit-ID: Iwvbp0H6jlg

--HG--
extra : rebase_source : 2c8bbab7aee617b65e5a7647ed146abdb0dde2d6
This commit is contained in:
Brian Birtles 2018-05-07 12:09:54 +09:00
parent f8c518344a
commit 516b224d43
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/animation/AnimationEffect.cpp
View File

@ -273,14 +273,14 @@ AnimationEffect::GetComputedTiming(const TimingParams* aTiming) const
playbackRate);
}
// Helper functions for generating a ComputedTimingProperties dictionary
// Helper functions for generating a ComputedEffectTiming dictionary
static void
GetComputedTimingDictionary(const ComputedTiming& aComputedTiming,
const Nullable<TimeDuration>& aLocalTime,
const TimingParams& aTiming,
ComputedTimingProperties& aRetVal)
ComputedEffectTiming& aRetVal)
{
// AnimationEffectTimingProperties
// EffectTiming
aRetVal.mDelay = aTiming.Delay().ToMilliseconds();
aRetVal.mEndDelay = aTiming.EndDelay().ToMilliseconds();
aRetVal.mFill = aComputedTiming.mFill;
@ -294,7 +294,7 @@ GetComputedTimingDictionary(const ComputedTiming& aComputedTiming,
aTiming.TimingFunction()->AppendToString(aRetVal.mEasing);
}
// ComputedTimingProperties
// ComputedEffectTiming
aRetVal.mActiveDuration = aComputedTiming.mActiveDuration.ToMilliseconds();
aRetVal.mEndTime = aComputedTiming.mEndTime.ToMilliseconds();
aRetVal.mLocalTime = AnimationUtils::TimeDurationToDouble(aLocalTime);
@ -311,8 +311,7 @@ GetComputedTimingDictionary(const ComputedTiming& aComputedTiming,
}
void
AnimationEffect::GetComputedTimingAsDict(
ComputedTimingProperties& aRetVal) const
AnimationEffect::GetComputedTimingAsDict(ComputedEffectTiming& aRetVal) const
{
double playbackRate = mAnimation ? mAnimation->PlaybackRate() : 1;
const Nullable<TimeDuration> currentTime = GetLocalTime();

4
dom/animation/AnimationEffect.h
View File

@ -27,7 +27,7 @@ namespace dom {
class Animation;
class AnimationEffectTimingReadOnly;
class KeyframeEffect;
struct ComputedTimingProperties;
struct ComputedEffectTiming;
class AnimationEffect : public nsISupports,
public nsWrapperCache
@ -80,7 +80,7 @@ public:
// Shortcut that gets the computed timing using the current local time as
// calculated from the timeline time.
ComputedTiming GetComputedTiming(const TimingParams* aTiming = nullptr) const;
void GetComputedTimingAsDict(ComputedTimingProperties& aRetVal) const;
void GetComputedTimingAsDict(ComputedEffectTiming& aRetVal) const;
virtual void SetAnimation(Animation* aAnimation) = 0;
Animation* GetAnimation() const { return mAnimation; };

9
dom/animation/TimingParams.cpp
View File

@ -16,11 +16,11 @@
namespace mozilla {
template <class OptionsType>
static const dom::AnimationEffectTimingProperties&
static const dom::EffectTiming&
GetTimingProperties(const OptionsType& aOptions);
template <>
/* static */ const dom::AnimationEffectTimingProperties&
/* static */ const dom::EffectTiming&
GetTimingProperties(
const dom::UnrestrictedDoubleOrKeyframeEffectOptions& aOptions)
{
@ -29,7 +29,7 @@ GetTimingProperties(
}
template <>
/* static */ const dom::AnimationEffectTimingProperties&
/* static */ const dom::EffectTiming&
GetTimingProperties(
const dom::UnrestrictedDoubleOrKeyframeAnimationOptions& aOptions)
{
@ -54,8 +54,7 @@ TimingParams::FromOptionsType(const OptionsType& aOptions,
return result;
}
} else {
const dom::AnimationEffectTimingProperties& timing =
GetTimingProperties(aOptions);
const dom::EffectTiming& timing = GetTimingProperties(aOptions);
Maybe<StickyTimeDuration> duration =
TimingParams::ParseDuration(timing.mDuration, aRv);

6
dom/webidl/AnimationEffect.webidl
View File

@ -25,7 +25,7 @@ enum PlaybackDirection {
"alternate-reverse"
};
dictionary AnimationEffectTimingProperties {
dictionary EffectTiming {
double delay = 0.0;
double endDelay = 0.0;
FillMode fill = "auto";
@ -36,7 +36,7 @@ dictionary AnimationEffectTimingProperties {
DOMString easing = "linear";
};
dictionary ComputedTimingProperties : AnimationEffectTimingProperties {
dictionary ComputedEffectTiming : EffectTiming {
unrestricted double endTime = 0.0;
unrestricted double activeDuration = 0.0;
double? localTime = null;
@ -49,5 +49,5 @@ interface AnimationEffect {
[Cached, Constant]
readonly attribute AnimationEffectTimingReadOnly timing;
[BinaryName="getComputedTimingAsDict"]
ComputedTimingProperties getComputedTiming();
ComputedEffectTiming getComputedTiming();
};

2
dom/webidl/KeyframeEffect.webidl
View File

@ -15,7 +15,7 @@ enum IterationCompositeOperation {
"accumulate"
};
dictionary KeyframeEffectOptions : AnimationEffectTimingProperties {
dictionary KeyframeEffectOptions : EffectTiming {
IterationCompositeOperation iterationComposite = "replace";
CompositeOperation composite = "replace";
};