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

Bug 1883138 - Ensure HasParserNotified returns true only when parser has actually notified, r=hsivonen

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D203324
This commit is contained in:
Olli Pettay 2024-03-07 12:52:30 +00:00
parent 43e6b85dbe
commit f575c3bb9f
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/base/Document.h
View File

@ -3878,7 +3878,12 @@ class Document : public nsINode,
void SetAllowDeclarativeShadowRoots(bool aAllowDeclarativeShadowRoots);
bool AllowsDeclarativeShadowRoots() const;
void SuspendDOMNotifications() { mSuspendDOMNotifications = true; }
void SuspendDOMNotifications() {
MOZ_ASSERT(IsHTMLDocument(),
"Currently suspending DOM notifications is supported only on "
"HTML documents.");
mSuspendDOMNotifications = true;
}
void ResumeDOMNotifications() { mSuspendDOMNotifications = false; }

3
dom/base/MutationObservers.cpp
View File

@ -81,9 +81,6 @@ template <NotifyPresShell aNotifyPresShell = NotifyPresShell::After,
static inline void Notify(nsINode* aNode, NotifyObserver&& aNotify,
uint32_t aCallback) {
Document* doc = aNode->OwnerDoc();
if (doc->DOMNotificationsSuspended()) {
return;
}
nsDOMMutationEnterLeave enterLeave(doc);
#ifdef DEBUG

11
parser/html/nsHtml5TreeOperation.cpp
View File

@ -257,9 +257,10 @@ nsresult nsHtml5TreeOperation::Append(nsIContent* aNode, nsIContent* aParent,
MOZ_ASSERT(aBuilder);
MOZ_ASSERT(aBuilder->IsInDocUpdate());
ErrorResult rv;
nsHtml5OtherDocUpdate update(aParent->OwnerDoc(), aBuilder->GetDocument());
Document* ownerDoc = aParent->OwnerDoc();
nsHtml5OtherDocUpdate update(ownerDoc, aBuilder->GetDocument());
aParent->AppendChildTo(aNode, false, rv);
if (!rv.Failed()) {
if (!rv.Failed() && !ownerDoc->DOMNotificationsSuspended()) {
aNode->SetParserHasNotified();
MutationObservers::NotifyContentAppended(aParent, aNode);
}
@ -303,8 +304,10 @@ nsresult nsHtml5TreeOperation::AppendToDocument(
return rv.StealNSResult();
}
aNode->SetParserHasNotified();
MutationObservers::NotifyContentInserted(doc, aNode);
if (!doc->DOMNotificationsSuspended()) {
aNode->SetParserHasNotified();
MutationObservers::NotifyContentInserted(doc, aNode);
}
NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
"Someone forgot to block scripts");