Bug 1374882 - Insert 'Timing' word into the names for setter/getter for timing function. r=birtles

MozReview-Commit-ID: 7h0VcoT4lmb

--HG--
extra : rebase_source : 41fb8f1d0ae4ebb6f5744389c7cccd4baaa5cbe3
This commit is contained in:
Hiroyuki Ikezoe 2017-06-22 12:12:43 +09:00
Родитель d3f51b0d7b
Коммит 8ffb31fc0b
5 изменённых файлов: 12 добавлений и 9 удалений

Просмотреть файл

@ -250,8 +250,8 @@ AnimationEffectReadOnly::GetComputedTimingAt(
}
// Apply the easing.
if (aTiming.Function()) {
progress = aTiming.Function()->GetValue(progress, result.mBeforeFlag);
if (aTiming.TimingFunction()) {
progress = aTiming.TimingFunction()->GetValue(progress, result.mBeforeFlag);
}
MOZ_ASSERT(IsFinite(progress), "Progress value should be finite");

Просмотреть файл

@ -139,11 +139,11 @@ AnimationEffectTiming::SetEasing(const nsAString& aEasing, ErrorResult& aRv)
return;
}
if (mTiming.Function() == newFunction) {
if (mTiming.TimingFunction() == newFunction) {
return;
}
mTiming.SetFunction(Move(newFunction));
mTiming.SetTimingFunction(Move(newFunction));
PostSpecifiedTimingUpdated(mEffect);
}

Просмотреть файл

@ -40,8 +40,8 @@ AnimationEffectTimingReadOnly::GetDuration(
void
AnimationEffectTimingReadOnly::GetEasing(nsString& aRetVal) const
{
if (mTiming.Function()) {
mTiming.Function()->AppendToString(aRetVal);
if (mTiming.TimingFunction()) {
mTiming.TimingFunction()->AppendToString(aRetVal);
} else {
aRetVal.AssignLiteral("linear");
}

Просмотреть файл

@ -208,11 +208,14 @@ struct TimingParams
}
dom::FillMode Fill() const { return mFill; }
void SetFunction(Maybe<ComputedTimingFunction>&& aFunction)
void SetTimingFunction(Maybe<ComputedTimingFunction>&& aFunction)
{
mFunction = Move(aFunction);
}
const Maybe<ComputedTimingFunction>& Function() const { return mFunction; }
const Maybe<ComputedTimingFunction>& TimingFunction() const
{
return mFunction;
}
private:
void Update()

Просмотреть файл

@ -555,7 +555,7 @@ AddAnimationForProperty(nsIFrame* aFrame, const AnimationProperty& aProperty,
animation->property() = aProperty.mProperty;
animation->playbackRate() = aAnimation->PlaybackRate();
animation->data() = aData;
animation->easingFunction() = ToTimingFunction(timing.Function());
animation->easingFunction() = ToTimingFunction(timing.TimingFunction());
animation->iterationComposite() =
static_cast<uint8_t>(aAnimation->GetEffect()->
AsKeyframeEffect()->IterationComposite());