Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1442080: Make IsOrHasAncestorWithDisplayNone faster in the Servo case. r=xidorn

Browse Source 
The code there wasn't flushing anyway, so kept doing that...

MozReview-Commit-ID: CwGiwOs9xaI

--HG--
extra : rebase_source : 325fe56deb842847575bfba6f1e2c30e5c1662ac
This commit is contained in:
Emilio Cobos Álvarez 2018-03-01 02:03:24 +01:00
parent 9b6b3d7b3b
commit 822eb19c88
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/html/nsGenericHTMLElement.cpp
View File

@ -2969,11 +2969,11 @@ nsGenericHTMLElement::NewURIFromString(const nsAString& aURISpec,
static bool
IsOrHasAncestorWithDisplayNone(Element* aElement, nsIPresShell* aPresShell)
{
// FIXME(emilio): In the servo case it should suffice to do something like:
//
// return !aElement->HasServoData() || Servo_Element_IsDisplayNone(aElement);
//
// at least in the case the element is part of the flattened tree...
if (aPresShell->StyleSet()->IsServo()) {
return !aElement->HasServoData() || Servo_Element_IsDisplayNone(aElement);
}
#ifdef MOZ_OLD_STYLE
AutoTArray<Element*, 10> elementsToCheck;
// Style and layout work on the flattened tree, so this is what we need to
// check in order to figure out whether we're in a display: none subtree.
@ -2990,26 +2990,22 @@ IsOrHasAncestorWithDisplayNone(Element* aElement, nsIPresShell* aPresShell)
return false;
}
StyleSetHandle styleSet = aPresShell->StyleSet();
RefPtr<nsStyleContext> sc;
nsStyleSet* styleSet = aPresShell->StyleSet()->AsGecko();
RefPtr<GeckoStyleContext> sc;
for (auto* element : Reversed(elementsToCheck)) {
if (sc) {
if (styleSet->IsGecko()) {
sc = styleSet->ResolveStyleFor(element, sc,
LazyComputeBehavior::Assert);
} else {
// Call ResolveStyleLazily to protect against stale element data in
// the tree when styled by Servo.
sc = styleSet->AsServo()->ResolveStyleLazily(
element, CSSPseudoElementType::NotPseudo);
}
sc = styleSet->ResolveStyleFor(element, sc, LazyComputeBehavior::Assert);
} else {
sc = nsComputedDOMStyle::GetStyleContextNoFlush(element, nullptr);
sc = nsComputedDOMStyle::GetStyleContextNoFlush(element, nullptr)
.downcast<GeckoStyleContext>();
}
if (sc->StyleDisplay()->mDisplay == StyleDisplay::None) {
return true;
}
}
#else
MOZ_CRASH("Old style system disabled");
#endif
return false;
}