Merging upstream version 125.0.1.

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

14 files changed, 22 insertions, 22 deletions

diff --git a/dom/xul/XULButtonElement.cpp b/dom/xul/XULButtonElement.cpp
index fa9ee28628..6c76488db4 100644
--- a/dom/xul/XULButtonElement.cpp
+++ b/dom/xul/XULButtonElement.cpp
@@ -317,9 +317,9 @@ void XULButtonElement::StartBlinking() {
       "XULButtonElement::StartBlinking", GetMainThreadSerialEventTarget());
 }
 
-void XULButtonElement::UnbindFromTree(bool aNullParent) {
+void XULButtonElement::UnbindFromTree(UnbindContext& aContext) {
   StopBlinking();
-  nsXULElement::UnbindFromTree(aNullParent);
+  nsXULElement::UnbindFromTree(aContext);
 }
 
 void XULButtonElement::ExecuteMenu(WidgetEvent& aEvent) {
diff --git a/dom/xul/XULButtonElement.h b/dom/xul/XULButtonElement.h
index fc880210a2..b79b8c2186 100644
--- a/dom/xul/XULButtonElement.h
+++ b/dom/xul/XULButtonElement.h
@@ -55,7 +55,7 @@ class XULButtonElement : public nsXULElement {
 
   XULMenuParentElement* GetMenuParent() const;
 
-  void UnbindFromTree(bool aNullParent) override;
+  void UnbindFromTree(UnbindContext&) override;
 
   MOZ_CAN_RUN_SCRIPT bool HandleKeyPress(KeyboardEvent& keyEvent);
   bool OpenedWithKey() const;
diff --git a/dom/xul/XULFrameElement.cpp b/dom/xul/XULFrameElement.cpp
index efbeb15829..87f1ecf71f 100644
--- a/dom/xul/XULFrameElement.cpp
+++ b/dom/xul/XULFrameElement.cpp
@@ -159,13 +159,13 @@ nsresult XULFrameElement::BindToTree(BindContext& aContext, nsINode& aParent) {
   return NS_OK;
 }
 
-void XULFrameElement::UnbindFromTree(bool aNullParent) {
+void XULFrameElement::UnbindFromTree(UnbindContext& aContext) {
   if (RefPtr<nsFrameLoader> frameLoader = GetFrameLoader()) {
     frameLoader->Destroy();
   }
   mFrameLoader = nullptr;
 
-  nsXULElement::UnbindFromTree(aNullParent);
+  nsXULElement::UnbindFromTree(aContext);
 }
 
 void XULFrameElement::DestroyContent() {
diff --git a/dom/xul/XULFrameElement.h b/dom/xul/XULFrameElement.h
index 13a65f42e8..20b467f66a 100644
--- a/dom/xul/XULFrameElement.h
+++ b/dom/xul/XULFrameElement.h
@@ -54,7 +54,7 @@ class XULFrameElement final : public nsXULElement, public nsFrameLoaderOwner {
 
   // nsIContent
   nsresult BindToTree(BindContext&, nsINode& aParent) override;
-  void UnbindFromTree(bool aNullParent) override;
+  void UnbindFromTree(UnbindContext&) override;
   void DestroyContent() override;
 
   void AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
diff --git a/dom/xul/XULMenuBarElement.cpp b/dom/xul/XULMenuBarElement.cpp
index f32698b3cd..1ec36d3859 100644
--- a/dom/xul/XULMenuBarElement.cpp
+++ b/dom/xul/XULMenuBarElement.cpp
@@ -85,7 +85,7 @@ nsresult XULMenuBarElement::BindToTree(BindContext& aContext,
   return NS_OK;
 }
 
-void XULMenuBarElement::UnbindFromTree(bool aNullParent) {
+void XULMenuBarElement::UnbindFromTree(UnbindContext& aContext) {
   if (mListener) {
     mListener->Detach();
     mListener = nullptr;
@@ -97,7 +97,7 @@ void XULMenuBarElement::UnbindFromTree(bool aNullParent) {
       pm->SetActiveMenuBar(this, false);
     }
   }
-  return XULMenuParentElement::UnbindFromTree(aNullParent);
+  return XULMenuParentElement::UnbindFromTree(aContext);
 }
 
 }  // namespace mozilla::dom
diff --git a/dom/xul/XULMenuBarElement.h b/dom/xul/XULMenuBarElement.h
index 117682642d..1d91fee660 100644
--- a/dom/xul/XULMenuBarElement.h
+++ b/dom/xul/XULMenuBarElement.h
@@ -38,7 +38,7 @@ class XULMenuBarElement final : public XULMenuParentElement {
   bool IsActiveByKeyboard() const { return mActiveByKeyboard; }
 
   nsresult BindToTree(BindContext&, nsINode& aParent) override;
-  void UnbindFromTree(bool aNullParent) override;
+  void UnbindFromTree(UnbindContext&) override;
 
  protected:
   ~XULMenuBarElement() override;
diff --git a/dom/xul/XULTreeElement.cpp b/dom/xul/XULTreeElement.cpp
index e190b22556..cd68d7e664 100644
--- a/dom/xul/XULTreeElement.cpp
+++ b/dom/xul/XULTreeElement.cpp
@@ -27,7 +27,7 @@ JSObject* XULTreeElement::WrapNode(JSContext* aCx,
   return XULTreeElement_Binding::Wrap(aCx, this, aGivenProto);
 }
 
-void XULTreeElement::UnbindFromTree(bool aNullParent) {
+void XULTreeElement::UnbindFromTree(UnbindContext& aContext) {
   // Drop the view's ref to us.
   if (mView) {
     nsCOMPtr<nsITreeSelection> sel;
@@ -39,7 +39,7 @@ void XULTreeElement::UnbindFromTree(bool aNullParent) {
   }
   mView = nullptr;
 
-  nsXULElement::UnbindFromTree(aNullParent);
+  nsXULElement::UnbindFromTree(aContext);
 }
 
 void XULTreeElement::DestroyContent() {
diff --git a/dom/xul/XULTreeElement.h b/dom/xul/XULTreeElement.h
index 381ae88f41..8d6cc383db 100644
--- a/dom/xul/XULTreeElement.h
+++ b/dom/xul/XULTreeElement.h
@@ -101,7 +101,7 @@ class XULTreeElement final : public nsXULElement {
   void EndUpdateBatch(void);
   void ClearStyleAndImageCaches(void);
 
-  virtual void UnbindFromTree(bool aNullParent) override;
+  virtual void UnbindFromTree(UnbindContext&) override;
   virtual void DestroyContent() override;
 
   void BodyDestroyed(int32_t aFirstVisibleRow) {
diff --git a/dom/xul/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp
index 197c5c2b3b..9a4f2deb23 100644
--- a/dom/xul/nsXULContentSink.cpp
+++ b/dom/xul/nsXULContentSink.cpp
@@ -27,7 +27,6 @@
 #include "nsParserBase.h"
 #include "nsViewManager.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsLayoutCID.h"
 #include "nsNetUtil.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
diff --git a/dom/xul/nsXULContentUtils.cpp b/dom/xul/nsXULContentUtils.cpp
index 109aa1975a..07de8f6cdb 100644
--- a/dom/xul/nsXULContentUtils.cpp
+++ b/dom/xul/nsXULContentUtils.cpp
@@ -20,7 +20,6 @@
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "nsXULContentUtils.h"
-#include "nsLayoutCID.h"
 #include "nsString.h"
 #include "nsGkAtoms.h"
 
diff --git a/dom/xul/nsXULElement.cpp b/dom/xul/nsXULElement.cpp
index 78c29fb315..5bccc15f69 100644
--- a/dom/xul/nsXULElement.cpp
+++ b/dom/xul/nsXULElement.cpp
@@ -654,7 +654,7 @@ nsresult nsXULElement::BindToTree(BindContext& aContext, nsINode& aParent) {
   return rv;
 }
 
-void nsXULElement::UnbindFromTree(bool aNullParent) {
+void nsXULElement::UnbindFromTree(UnbindContext& aContext) {
   if (NodeInfo()->Equals(nsGkAtoms::keyset, kNameSpaceID_XUL)) {
     XULKeySetGlobalKeyListener::DetachKeyHandler(this);
   }
@@ -689,7 +689,7 @@ void nsXULElement::UnbindFromTree(bool aNullParent) {
     slots->mControllers = nullptr;
   }
 
-  nsStyledElement::UnbindFromTree(aNullParent);
+  nsStyledElement::UnbindFromTree(aContext);
 }
 
 void nsXULElement::DoneAddingChildren(bool aHaveNotified) {
@@ -1426,6 +1426,10 @@ nsresult nsXULPrototypeElement::SetAttrAt(uint32_t aPos,
     mAttributes[aPos].mValue.ParseAtom(aValue);
 
     return NS_OK;
+  } else if (mAttributes[aPos].mName.Equals(nsGkAtoms::aria_activedescendant)) {
+    mAttributes[aPos].mValue.ParseAtom(aValue);
+
+    return NS_OK;
   } else if (mAttributes[aPos].mName.Equals(nsGkAtoms::is)) {
     // Store is as atom.
     mAttributes[aPos].mValue.ParseAtom(aValue);
@@ -1839,9 +1843,8 @@ class ScriptCompileTask final : public Task {
       return;
     }
 
-    JS::CompilationStorage compileStorage;
-    mStencil = JS::CompileGlobalScriptToStencil(mFrontendContext, mOptions,
-                                                srcBuf, compileStorage);
+    mStencil =
+        JS::CompileGlobalScriptToStencil(mFrontendContext, mOptions, srcBuf);
 #ifdef DEBUG
     // Chrome-privileged code shouldn't have any compilation error.
     CheckErrorsAndWarnings(mFrontendContext, mOptions);
diff --git a/dom/xul/nsXULElement.h b/dom/xul/nsXULElement.h
index 4002ec63dc..2681a14a9a 100644
--- a/dom/xul/nsXULElement.h
+++ b/dom/xul/nsXULElement.h
@@ -374,7 +374,7 @@ class nsXULElement : public nsStyledElement {
       mozilla::EventChainVisitor& aVisitor) override;
   // nsIContent
   virtual nsresult BindToTree(BindContext&, nsINode& aParent) override;
-  virtual void UnbindFromTree(bool aNullParent) override;
+  virtual void UnbindFromTree(UnbindContext&) override;
   virtual void DestroyContent() override;
   virtual void DoneAddingChildren(bool aHaveNotified) override;
 
diff --git a/dom/xul/nsXULPopupListener.cpp b/dom/xul/nsXULPopupListener.cpp
index 9f2ee88e8d..35445d6d3e 100644
--- a/dom/xul/nsXULPopupListener.cpp
+++ b/dom/xul/nsXULPopupListener.cpp
@@ -12,7 +12,6 @@
 #include "XULButtonElement.h"
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
-#include "nsContentCID.h"
 #include "nsContentUtils.h"
 #include "nsXULPopupManager.h"
 #include "nsIScriptContext.h"
diff --git a/dom/xul/test/test_bug468176.xhtml b/dom/xul/test/test_bug468176.xhtml
index f21c1bcde3..3f4c690b6f 100644
--- a/dom/xul/test/test_bug468176.xhtml
+++ b/dom/xul/test/test_bug468176.xhtml
@@ -27,7 +27,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=468176
   SimpleTest.waitForExplicitFinish();
 
   var broadcastCount = 0;
-  function b_listener(evt) {
+  function b_listener() {
     ++broadcastCount;
   }