Bug 1412716 - Drop KeyframeEffectReadOnly::mIsComposingStyle. r=emilio

The flag was introduced in bug 1322291 to prevent recursive calls of
KeyframeEffectReadOnly::ComposeStyle() on the old style system.  On the
new style system we never call the function recursively.

MozReview-Commit-ID: L5gb8G3bl4M

--HG--
extra : rebase_source : 3b01c2c3ff97b8890bf13095dd32b834270d00df
This commit is contained in:
Hiroyuki Ikezoe 2018-04-09 20:15:59 +09:00
Родитель 71f08a9c46
Коммит 4ac31f33e0
2 изменённых файлов: 0 добавлений и 21 удалений

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

@ -283,15 +283,6 @@ KeyframeEffectReadOnly::UpdateProperties(const ComputedStyle* aStyle)
{
MOZ_ASSERT(aStyle);
// Skip updating properties when we are composing style.
// FIXME: Bug 1324966. Drop this check once we have a function to get
// ComputedStyle without resolving animating style.
MOZ_DIAGNOSTIC_ASSERT(!mIsComposingStyle,
"Should not be called while processing ComposeStyle()");
if (mIsComposingStyle) {
return;
}
nsTArray<AnimationProperty> properties = BuildProperties(aStyle);
// We need to update base styles even if any properties are not changed at all
@ -426,15 +417,6 @@ KeyframeEffectReadOnly::ComposeStyle(
RawServoAnimationValueMap& aComposeResult,
const nsCSSPropertyIDSet& aPropertiesToSkip)
{
MOZ_DIAGNOSTIC_ASSERT(!mIsComposingStyle,
"Should not be called recursively");
if (mIsComposingStyle) {
return;
}
AutoRestore<bool> isComposingStyle(mIsComposingStyle);
mIsComposingStyle = true;
ComputedTiming computedTiming = GetComputedTiming();
// If the progress is null, we don't have fill data for the current

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

@ -421,9 +421,6 @@ private:
nsChangeHint_AddOrRemoveTransform |
nsChangeHint_UpdateTransformLayer);
}
// FIXME: This flag will be removed in bug 1324966.
bool mIsComposingStyle = false;
};
} // namespace dom