Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1347979 - Don't call methods that may flush in nsRange::GetInnerTextNoFlush. r=smaug

Browse Source 
MozReview-Commit-ID: AsnRqTH4FkM
This commit is contained in:
Mats Palmgren 2017-03-18 18:44:27 +01:00
parent 95ca34da95
commit 211a6840d0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/base/nsRange.cpp
View File

@ -3461,13 +3461,14 @@ IsVisibleAndNotInReplacedElement(nsIFrame* aFrame)
}
static bool
ElementIsVisible(Element* aElement)
ElementIsVisibleNoFlush(Element* aElement)
{
if (!aElement) {
return false;
}
RefPtr<nsStyleContext> sc = nsComputedDOMStyle::GetStyleContextForElement(
aElement, nullptr, nullptr);
RefPtr<nsStyleContext> sc =
nsComputedDOMStyle::GetStyleContextForElementNoFlush(aElement, nullptr,
nullptr);
return sc && sc->StyleVisibility()->IsVisible();
}
@ -3595,7 +3596,7 @@ nsRange::GetInnerTextNoFlush(DOMString& aValue, ErrorResult& aError,
if (currentState == AT_NODE) {
bool isText = currentNode->IsNodeOfType(nsINode::eTEXT);
if (isText && currentNode->GetParent()->IsHTMLElement(nsGkAtoms::rp) &&
ElementIsVisible(currentNode->GetParent()->AsElement())) {
ElementIsVisibleNoFlush(currentNode->GetParent()->AsElement())) {
nsAutoString str;
currentNode->GetTextContent(str, aError);
result.Append(str);