Bug 1285407 - Part 4: Drop EffectCompositor::MaybeUpdateCascadeResults(Element*, CSSPseudoElementType) because it's essentially the same as another one. r=birtles

MozReview-Commit-ID: 2Locox5zmP4

--HG--
extra : rebase_source : 8970da8d3081e959a6ceef84ae6dcaf65718f93e
This commit is contained in:
Hiroyuki Ikezoe 2016-07-11 17:28:19 +09:00
Родитель 2b220f490f
Коммит 044369121c
2 изменённых файлов: 3 добавлений и 25 удалений

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

@ -392,7 +392,9 @@ EffectCompositor::AddStyleUpdatesTo(RestyleTracker& aTracker)
}
for (auto& pseudoElem : elementsToRestyle) {
MaybeUpdateCascadeResults(pseudoElem.mElement, pseudoElem.mPseudoType);
MaybeUpdateCascadeResults(pseudoElem.mElement,
pseudoElem.mPseudoType,
nullptr);
ComposeAnimationRule(pseudoElem.mElement,
pseudoElem.mPseudoType,
@ -476,24 +478,6 @@ EffectCompositor::MaybeUpdateCascadeResults(Element* aElement,
MOZ_ASSERT(!effects->CascadeNeedsUpdate(), "Failed to update cascade state");
}
/* static */ void
EffectCompositor::MaybeUpdateCascadeResults(Element* aElement,
CSSPseudoElementType aPseudoType)
{
nsStyleContext* styleContext = nullptr;
{
dom::Element* elementToRestyle = GetElementToRestyle(aElement, aPseudoType);
if (elementToRestyle) {
nsIFrame* frame = elementToRestyle->GetPrimaryFrame();
if (frame) {
styleContext = frame->StyleContext();
}
}
}
MaybeUpdateCascadeResults(aElement, aPseudoType, styleContext);
}
namespace {
class EffectCompositeOrderComparator {
public:

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

@ -185,12 +185,6 @@ public:
CSSPseudoElementType aPseudoType,
nsStyleContext* aStyleContext);
// An overload of MaybeUpdateCascadeResults that uses the style context
// of the primary frame of the specified (pseudo-)element, when available.
static void
MaybeUpdateCascadeResults(dom::Element* aElement,
CSSPseudoElementType aPseudoType);
// Update the mWinsInCascade member for each property in effects targetting
// the specified (pseudo-)element.
//