Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
MozReview-Commit-ID: 7h0VcoT4lmb

--HG--
extra : rebase_source : 41fb8f1d0ae4ebb6f5744389c7cccd4baaa5cbe3
This commit is contained in:
Hiroyuki Ikezoe 2017-06-22 12:12:43 +09:00
parent d3f51b0d7b
commit 8ffb31fc0b
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/animation/AnimationEffectReadOnly.cpp
View File

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

4
dom/animation/AnimationEffectTiming.cpp
View File

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

4
dom/animation/AnimationEffectTimingReadOnly.cpp
View File

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

7
dom/animation/TimingParams.h
View File

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

2
layout/painting/nsDisplayList.cpp
View File

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