зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset c1be168c4c63 (bug 1351535)
This commit is contained in:
Родитель
8bfc118fde
Коммит
bf54d9ef97
|
@ -962,26 +962,6 @@ EffectCompositor::SetPerformanceWarning(
|
|||
|
||||
bool
|
||||
EffectCompositor::PreTraverse()
|
||||
{
|
||||
return PreTraverseInSubtree(nullptr);
|
||||
}
|
||||
|
||||
static bool
|
||||
IsFlattenedTreeDescendantOf(nsINode* aPossibleDescendant,
|
||||
nsINode* aPossibleAncestor)
|
||||
{
|
||||
do {
|
||||
if (aPossibleDescendant == aPossibleAncestor) {
|
||||
return true;
|
||||
}
|
||||
aPossibleDescendant = aPossibleDescendant->GetFlattenedTreeParentNode();
|
||||
} while (aPossibleDescendant);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
EffectCompositor::PreTraverseInSubtree(Element* aRoot)
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
MOZ_ASSERT(mPresContext->RestyleManager()->IsServo());
|
||||
|
@ -997,12 +977,6 @@ EffectCompositor::PreTraverseInSubtree(Element* aRoot)
|
|||
|
||||
NonOwningAnimationTarget target = iter.Key();
|
||||
|
||||
// Ignore restyles that aren't in the flattened tree subtree rooted at
|
||||
// aRoot.
|
||||
if (aRoot && !IsFlattenedTreeDescendantOf(target.mElement, aRoot)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// We need to post restyle hints even if the target is not in EffectSet to
|
||||
// ensure the final restyling for removed animations.
|
||||
// We can't call PostRestyleEvent directly here since we are still in the
|
||||
|
|
|
@ -249,10 +249,6 @@ public:
|
|||
// Similar to the above but only for the (pseudo-)element.
|
||||
bool PreTraverse(dom::Element* aElement, nsIAtom* aPseudoTagOrNull);
|
||||
|
||||
// Similar to the above but for all elements in the subtree rooted
|
||||
// at aElement.
|
||||
bool PreTraverseInSubtree(dom::Element* aElement);
|
||||
|
||||
private:
|
||||
~EffectCompositor() = default;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче