author | Brian Birtles <birtles@gmail.com> |
Thu, 06 Dec 2018 20:57:58 +0000 | |
changeset 449556 | 3c61fb185d513883a3a9c8eb510e102b0e7f5158 |
parent 449555 | 174486c8cedba1a86ac4c7f643c7410e4aedd60f |
child 449557 | 868ceb8ba4df9df67fefeb60f30c8de9a0a46af7 |
push id | 35171 |
push user | rmaries@mozilla.com |
push date | Fri, 07 Dec 2018 09:27:28 +0000 |
treeherder | mozilla-central@6725a7f43bae [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | hiro |
bugs | 1488122 |
milestone | 65.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
dom/animation/KeyframeEffect.cpp | file | annotate | diff | comparison | revisions | |
dom/animation/KeyframeEffect.h | file | annotate | diff | comparison | revisions |
--- a/dom/animation/KeyframeEffect.cpp +++ b/dom/animation/KeyframeEffect.cpp @@ -369,18 +369,17 @@ void KeyframeEffect::EnsureBaseStyles( if (aBaseStylesChanged != nullptr) { *aBaseStylesChanged = false; } if (!mTarget) { return; } - Maybe<nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>> - previousBaseStyles; + Maybe<BaseValuesHashmap> previousBaseStyles; if (aBaseStylesChanged != nullptr) { previousBaseStyles.emplace(std::move(mBaseValues)); } mBaseValues.Clear(); nsPresContext* presContext = nsContentUtils::GetContextForContent(mTarget->mElement);
--- a/dom/animation/KeyframeEffect.h +++ b/dom/animation/KeyframeEffect.h @@ -397,17 +397,19 @@ class KeyframeEffect : public AnimationE // We need to track when we go to or from being "in effect" since // we need to re-evaluate the cascade of animations when that changes. bool mInEffectOnLastAnimationTimingUpdate; // The non-animated values for properties in this effect that contain at // least one animation value that is composited with the underlying value // (i.e. it uses the additive or accumulate composite mode). - nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue> mBaseValues; + using BaseValuesHashmap = + nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>; + BaseValuesHashmap mBaseValues; // True if this effect is in the EffectSet for its target element. This is // used as an optimization to avoid unnecessary hashmap lookups on the // EffectSet. bool mInEffectSet = false; private: nsChangeHint mCumulativeChangeHint;