wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 996796 patch 14 - Fix the aElementForAnimation passed from ResolveStyleWithReplacement. r=heycam

Browse Source
This commit is contained in:
L. David Baron 2014-08-02 19:37:45 -07:00
parent 9b14538555
commit 56fa692637
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
layout/style/nsStyleSet.cpp
View File

@ -35,6 +35,7 @@
#include "nsHTMLStyleSheet.h"
#include "nsCSSRules.h"
#include "nsPrintfCString.h"
#include "nsIFrame.h"
using namespace mozilla;
using namespace mozilla::dom;
@ -1451,10 +1452,35 @@ nsStyleSet::ResolveStyleWithReplacement(Element* aElement,
}
}
nsCSSPseudoElements::Type pseudoType = aOldStyleContext->GetPseudoType();
Element* elementForAnimation = nullptr;
if (pseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
pseudoType == nsCSSPseudoElements::ePseudo_before ||
pseudoType == nsCSSPseudoElements::ePseudo_after) {
// We want to compute a correct elementForAnimation to pass in
// because at this point the parameter is more than just the element
// for animation; it's also used for the SetBodyTextColor call when
// it's the body element.
// However, we only want to set the flag to call CheckAnimationRule
// if we're dealing with a replacement (such as style attribute
// replacement) that could lead to the animation property changing,
// and we explicitly do NOT want to call CheckAnimationRule when
// we're trying to do an animation-only update.
if (aReplacements & ~(eRestyle_CSSTransitions | eRestyle_CSSAnimations)) {
flags |= eDoAnimation;
}
elementForAnimation = aElement;
NS_ASSERTION(pseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
!elementForAnimation->GetPrimaryFrame() ||
elementForAnimation->GetPrimaryFrame()->StyleContext()->
GetPseudoType() ==
nsCSSPseudoElements::ePseudo_NotPseudoElement,
"aElement should be the element and not the pseudo-element");
}
return GetContext(aNewParentContext, ruleNode, visitedRuleNode,
aOldStyleContext->GetPseudo(),
aOldStyleContext->GetPseudoType(),
nullptr, flags);
aOldStyleContext->GetPseudo(), pseudoType,
elementForAnimation, flags);
}