Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f182a6c18d75 (bug 1279819)

Browse Source
This commit is contained in:
Brian Birtles 2016-07-06 09:09:55 +09:00
parent 454f9549c2
commit 3743434413
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/animation/KeyframeEffect.cpp
View File

@ -524,34 +524,20 @@ KeyframeEffectReadOnly::UpdateProperties(nsStyleContext* aStyleContext)
nsTArray<AnimationProperty> properties; nsTArray<AnimationProperty> properties;
if (mTarget) { if (mTarget) {
// When GetComputedKeyframeValues or GetAnimationPropertiesFromKeyframes
// calculate computed values from |mKeyframes|, they could possibly
// trigger a subsequent restyle in which we rebuild animations. If that
// happens case we could find that |mKeyframes| is overwritten while it is
// being iterated over. Normally that shouldn't happen, (and we have an
// assertion below to detect if it does) but just in case we make a copy of
// |mKeyframes| first and iterate over that instead.
auto keyframesCopy(mKeyframes);
nsTArray<ComputedKeyframeValues> computedValues = nsTArray<ComputedKeyframeValues> computedValues =
KeyframeUtils::GetComputedKeyframeValues(keyframesCopy, KeyframeUtils::GetComputedKeyframeValues(mKeyframes, mTarget->mElement,
mTarget->mElement,
aStyleContext); aStyleContext);
if (mEffectOptions.mSpacingMode == SpacingMode::paced) { if (mEffectOptions.mSpacingMode == SpacingMode::paced) {
KeyframeUtils::ApplySpacing(keyframesCopy, SpacingMode::paced, KeyframeUtils::ApplySpacing(mKeyframes, SpacingMode::paced,
mEffectOptions.mPacedProperty, mEffectOptions.mPacedProperty,
computedValues); computedValues);
} }
properties = properties =
KeyframeUtils::GetAnimationPropertiesFromKeyframes(keyframesCopy, KeyframeUtils::GetAnimationPropertiesFromKeyframes(mKeyframes,
computedValues, computedValues,
aStyleContext); aStyleContext);
MOZ_ASSERT(keyframesCopy == mKeyframes,
"Keyframes should not be modified while we are iterating"
" over them");
} }
if (mProperties == properties) { if (mProperties == properties) {

8
dom/animation/KeyframeEffect.h
View File

@ -106,14 +106,6 @@ struct Keyframe
return *this; return *this;
} }
bool operator==(const Keyframe& aOther) const
{
return mOffset == aOther.mOffset &&
mComputedOffset == aOther.mComputedOffset &&
mTimingFunction == aOther.mTimingFunction &&
mPropertyValues == aOther.mPropertyValues;
}
Maybe<double> mOffset; Maybe<double> mOffset;
static MOZ_CONSTEXPR_VAR double kComputedOffsetNotSet = -1.0; static MOZ_CONSTEXPR_VAR double kComputedOffsetNotSet = -1.0;
double mComputedOffset = kComputedOffsetNotSet; double mComputedOffset = kComputedOffsetNotSet;