Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 7 insertions, 7 deletions

diff --git a/dom/xml/XMLDocument.cpp b/dom/xml/XMLDocument.cpp
index e62269b9a6..e9136bbe46 100644
--- a/dom/xml/XMLDocument.cpp
+++ b/dom/xml/XMLDocument.cpp
@@ -17,7 +17,6 @@
 #include "nsNetUtil.h"
 #include "nsError.h"
 #include "nsIPrincipal.h"
-#include "nsLayoutCID.h"
 #include "mozilla/dom/Attr.h"
 #include "nsCExternalHandlerService.h"
 #include "nsMimeTypes.h"
diff --git a/dom/xml/XMLStylesheetProcessingInstruction.cpp b/dom/xml/XMLStylesheetProcessingInstruction.cpp
index 9f0d3f6156..a022ed4272 100644
--- a/dom/xml/XMLStylesheetProcessingInstruction.cpp
+++ b/dom/xml/XMLStylesheetProcessingInstruction.cpp
@@ -49,10 +49,11 @@ nsresult XMLStylesheetProcessingInstruction::BindToTree(BindContext& aContext,
   return rv;
 }
 
-void XMLStylesheetProcessingInstruction::UnbindFromTree(bool aNullParent) {
+void XMLStylesheetProcessingInstruction::UnbindFromTree(
+    UnbindContext& aContext) {
   nsCOMPtr<Document> oldDoc = GetUncomposedDoc();
 
-  ProcessingInstruction::UnbindFromTree(aNullParent);
+  ProcessingInstruction::UnbindFromTree(aContext);
   Unused << UpdateStyleSheetInternal(oldDoc, nullptr);
 }
 
diff --git a/dom/xml/XMLStylesheetProcessingInstruction.h b/dom/xml/XMLStylesheetProcessingInstruction.h
index a6b3aa6978..cacc0aa932 100644
--- a/dom/xml/XMLStylesheetProcessingInstruction.h
+++ b/dom/xml/XMLStylesheetProcessingInstruction.h
@@ -43,7 +43,7 @@ class XMLStylesheetProcessingInstruction final : public ProcessingInstruction,
 
   // nsIContent
   virtual nsresult BindToTree(BindContext&, nsINode& aParent) override;
-  virtual void UnbindFromTree(bool aNullParent = true) override;
+  virtual void UnbindFromTree(UnbindContext&) override;
 
   /**
    * Tells this processing instruction to use a different base URI. This is used
diff --git a/dom/xml/nsXMLElement.cpp b/dom/xml/nsXMLElement.cpp
index ef51715d1b..124d4f5873 100644
--- a/dom/xml/nsXMLElement.cpp
+++ b/dom/xml/nsXMLElement.cpp
@@ -28,7 +28,7 @@ JSObject* nsXMLElement::WrapNode(JSContext* aCx,
   return Element_Binding::Wrap(aCx, this, aGivenProto);
 }
 
-void nsXMLElement::UnbindFromTree(bool aNullParent) {
+void nsXMLElement::UnbindFromTree(UnbindContext& aContext) {
   nsAtom* property;
   switch (GetPseudoElementType()) {
     case PseudoStyleType::marker:
@@ -48,7 +48,7 @@ void nsXMLElement::UnbindFromTree(bool aNullParent) {
     MOZ_ASSERT(GetParent()->IsElement());
     GetParent()->RemoveProperty(property);
   }
-  Element::UnbindFromTree(aNullParent);
+  Element::UnbindFromTree(aContext);
 }
 
 NS_IMPL_ELEMENT_CLONE(nsXMLElement)
diff --git a/dom/xml/nsXMLElement.h b/dom/xml/nsXMLElement.h
index e401965fff..01b526f451 100644
--- a/dom/xml/nsXMLElement.h
+++ b/dom/xml/nsXMLElement.h
@@ -23,7 +23,7 @@ class nsXMLElement : public mozilla::dom::Element {
   virtual nsresult Clone(mozilla::dom::NodeInfo*,
                          nsINode** aResult) const override;
 
-  virtual void UnbindFromTree(bool aNullParent = true) override;
+  virtual void UnbindFromTree(UnbindContext&) override;
 
  protected:
   virtual ~nsXMLElement() = default;