From 17182d8b63349d555e814c362c8d6539a2d89b31 Mon Sep 17 00:00:00 2001
From: yup <yup@email.su>
Date: Fri, 8 Mar 2024 14:04:02 +0000
Subject: [PATCH 1/5] Eliminated exceptions in event handlers that happen when
 "this.view" does not exists (empty tree)

---
 toolkit/content/widgets/tree.xml | 72 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/toolkit/content/widgets/tree.xml b/toolkit/content/widgets/tree.xml
index bacea636db..ec88a1e09d 100644
--- a/toolkit/content/widgets/tree.xml
+++ b/toolkit/content/widgets/tree.xml
@@ -737,6 +737,7 @@
       </handler>
       <handler event="MozSwipeGesture" preventdefault="true">
         <![CDATA[
+          if (!this.view) return;
           // Figure out which row to show
           let targetRow = 0;
 
@@ -756,6 +757,7 @@
       <handler event="focus">
         <![CDATA[
           this.treeBoxObject.focused = true;
+          if (!this.view) return;
           if (this.currentIndex == -1 && this.view.rowCount > 0) {
             this.currentIndex = this.treeBoxObject.getFirstVisibleRow();
           }
@@ -778,7 +780,7 @@
       <!-- Use F2 key to enter text editing. -->
       <handler event="keydown" keycode="VK_F2">
         <![CDATA[
-          if (!this._cellSelType)
+          if (!this.view || !this._cellSelType)
             return;
           var row = this.currentIndex;
           var column = this.view.selection.currentColumn;
@@ -900,112 +902,112 @@
       </handler>
       <handler event="keydown" keycode="VK_UP" modifiers="accel any">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByOffset(-1, 0, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_DOWN" modifiers="accel any">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByOffset(1, this.view.rowCount - 1, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_UP" modifiers="accel any, shift">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByOffsetShift(-1, 0, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_DOWN" modifiers="accel any, shift">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByOffsetShift(1, this.view.rowCount - 1, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_PAGE_UP" modifiers="accel any">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByPage(-1, 0, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_PAGE_DOWN" modifiers="accel any">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByPage(1, this.view.rowCount - 1, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_PAGE_UP" modifiers="accel any, shift">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByPageShift(-1, 0, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_PAGE_DOWN" modifiers="accel any, shift">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveByPageShift(1, this.view.rowCount - 1, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_HOME" modifiers="accel any">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveToEdge(0, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_END" modifiers="accel any">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveToEdge(this.view.rowCount - 1, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_HOME" modifiers="accel any, shift">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveToEdgeShift(0, event);
         ]]>
       </handler>
       <handler event="keydown" keycode="VK_END" modifiers="accel any, shift">
         <![CDATA[
-          if (this._editingColumn)
+          if (!this.view || this._editingColumn)
             return;
           _moveToEdgeShift(this.view.rowCount - 1, event);
         ]]>
       </handler>
       <handler event="keypress">
         <![CDATA[
-         if (this._editingColumn)
-           return;
+          if (!this.view || this._editingColumn)
+            return;
 
-         if (event.charCode == ' '.charCodeAt(0)) {
-           var c = this.currentIndex;
-           if (!this.view.selection.isSelected(c) ||
-               (!this.view.selection.single && this._isAccelPressed(event))) {
-             this.view.selection.toggleSelect(c);
-             event.preventDefault();
-           }
-         }
-         else if (!this.disableKeyNavigation && event.charCode > 0 &&
-                  !event.altKey && !this._isAccelPressed(event) &&
-                  !event.metaKey && !event.ctrlKey) {
-           var l = this._keyNavigate(event);
-           if (l >= 0) {
-             this.view.selection.timedSelect(l, this._selectDelay);
-             this.treeBoxObject.ensureRowIsVisible(l);
-           }
-           event.preventDefault();
-         }
-         ]]>
+          if (event.charCode == ' '.charCodeAt(0)) {
+            var c = this.currentIndex;
+            if (!this.view.selection.isSelected(c) ||
+                (!this.view.selection.single && this._isAccelPressed(event))) {
+              this.view.selection.toggleSelect(c);
+              event.preventDefault();
+            }
+          }
+          else if (!this.disableKeyNavigation && event.charCode > 0 &&
+                   !event.altKey && !this._isAccelPressed(event) &&
+                   !event.metaKey && !event.ctrlKey) {
+            var l = this._keyNavigate(event);
+            if (l >= 0) {
+              this.view.selection.timedSelect(l, this._selectDelay);
+              this.treeBoxObject.ensureRowIsVisible(l);
+            }
+            event.preventDefault();
+          }
+          ]]>
       </handler>
     </handlers>
   </binding>
@@ -1558,4 +1560,4 @@
       </handler>
     </handlers>
   </binding>
-</bindings>
+</bindings>
\ No newline at end of file

From f5edbe658c0442a5699126d28f8bf9033ce67c2a Mon Sep 17 00:00:00 2001
From: yup <yup@email.su>
Date: Sat, 9 Mar 2024 12:03:08 +0000
Subject: [PATCH 2/5] Colump picker should work even if there are no rows in
 the tree

---
 toolkit/content/widgets/tree.xml | 38 ++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/toolkit/content/widgets/tree.xml b/toolkit/content/widgets/tree.xml
index ec88a1e09d..1fc7577289 100644
--- a/toolkit/content/widgets/tree.xml
+++ b/toolkit/content/widgets/tree.xml
@@ -789,7 +789,6 @@
         ]]>
       </handler>
 #endif // XP_MACOSX
-
       <handler event="keydown" keycode="VK_ESCAPE">
         <![CDATA[
           if (this._editingColumn) {
@@ -1497,12 +1496,13 @@
             var refChild = aPopup.firstChild;
 
             var tree = this.parentNode.parentNode;
-            for (var currCol = tree.columns.getFirstColumn(); currCol;
-                 currCol = currCol.getNext()) {
-              // Construct an entry for each column in the row, unless
-              // it is not being shown.
-              var currElement = currCol.element;
-              if (!currElement.hasAttribute("ignoreincolumnpicker")) {
+            if (tree.columns)
+              for (var currCol = tree.columns.getFirstColumn(); currCol = currCol.getNext(); ) {
+                // Construct an entry for each column in the row, unless
+                // it is not being shown.
+                var currElement = currCol.element;
+                if (currElement.hasAttribute("ignoreincolumnpicker"))
+                  continue;
                 var popupChild = document.createElement("menuitem");
                 popupChild.setAttribute("type", "checkbox");
                 var columnName = currElement.getAttribute("display") ||
@@ -1515,6 +1515,30 @@
                   popupChild.setAttribute("disabled", "true");
                 aPopup.insertBefore(popupChild, refChild);
               }
+            else {
+              if (!tree.firstChild || tree.firstChild.nodeName != "treecols")
+                return;
+              var columns = [];
+              tree.firstChild.childNodes.forEach(function (currElement) {
+                if (currElement.nodeName != "treecol" ||
+                    currElement.hasAttribute("ignoreincolumnpicker"))
+                  return;
+                var popupChild = document.createElement("menuitem");
+                popupChild.setAttribute("type", "checkbox");
+                var columnName = currElement.getAttribute("display") ||
+                                 currElement.getAttribute("label");
+                popupChild.setAttribute("label", columnName);
+                if (currElement.getAttribute("hidden") != "true")
+                  popupChild.setAttribute("checked", "true");
+                if (currElement.getAttribute("primary") == "true")
+                  popupChild.setAttribute("disabled", "true");
+                columns[currElement.getAttribute("ordinal")] = popupChild;
+              });
+              columns.filter(function () { return true; })
+                     .forEach(function (e, i) {
+                        e.setAttribute("colindex", i);
+                        aPopup.insertBefore(e, refChild);
+                      });
             }
 
             var hidden = !tree.enableColumnDrag;

From 0dd6a089f6dfb7859114425c60c967ea57e5306f Mon Sep 17 00:00:00 2001
From: yup <yup@email.su>
Date: Sun, 17 Mar 2024 15:41:22 +0000
Subject: [PATCH 3/5] Minor performance improvement by elimination of an
 unnecessary intermediate array

---
 toolkit/content/widgets/tree.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/toolkit/content/widgets/tree.xml b/toolkit/content/widgets/tree.xml
index 1fc7577289..d177c8ccf7 100644
--- a/toolkit/content/widgets/tree.xml
+++ b/toolkit/content/widgets/tree.xml
@@ -789,6 +789,7 @@
         ]]>
       </handler>
 #endif // XP_MACOSX
+
       <handler event="keydown" keycode="VK_ESCAPE">
         <![CDATA[
           if (this._editingColumn) {
@@ -1534,10 +1535,10 @@
                   popupChild.setAttribute("disabled", "true");
                 columns[currElement.getAttribute("ordinal")] = popupChild;
               });
-              columns.filter(function () { return true; })
-                     .forEach(function (e, i) {
+              columns.filter(function (e, i) {
                         e.setAttribute("colindex", i);
                         aPopup.insertBefore(e, refChild);
+                        return false;
                       });
             }
 

From c230e21d237fe6ef223d71c4576facfbcbfc3448 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 20 Mar 2024 15:18:32 +0100
Subject: [PATCH 4/5] [parser] Specialize AddAttributes for <html>/<body>.

---
 parser/html/nsHtml5TreeOperation.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp
index 236c1f1081..5e3f01ef3f 100644
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -330,6 +330,8 @@ nsHtml5TreeOperation::AddAttributes(nsIContent* aNode,
                                     nsHtml5HtmlAttributes* aAttributes,
                                     nsHtml5DocumentBuilder* aBuilder)
 {
+  MOZ_ASSERT(aNode->IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::html));
+
   dom::Element* node = aNode->AsElement();
   nsHtml5OtherDocUpdate update(node->OwnerDoc(),
                                aBuilder->GetDocument());
@@ -342,7 +344,8 @@ nsHtml5TreeOperation::AddAttributes(nsIContent* aNode,
     nsCOMPtr<nsIAtom> localName =
       Reget(aAttributes->getLocalNameNoBoundsCheck(i));
     int32_t nsuri = aAttributes->getURINoBoundsCheck(i);
-    if (!node->HasAttr(nsuri, localName)) {
+    if (!node->HasAttr(nsuri, localName) &&
+        !(nsuri == kNameSpaceID_None && localName == nsGkAtoms::nonce)) {
       // prefix doesn't need regetting. it is always null or a static atom
       // local name is never null
       nsString value; // Not Auto, because using it to hold nsStringBuffer*

From e6e8224040edc4f66051f2c104555826fcd7b74f Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 20 Mar 2024 15:55:46 +0100
Subject: [PATCH 5/5] [MFBT] Make move assignment of RefPtr have the same
 behavior as nsCOMPtr

---
 mfbt/RefPtr.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mfbt/RefPtr.h b/mfbt/RefPtr.h
index 71d186ab40..d4f12dda44 100644
--- a/mfbt/RefPtr.h
+++ b/mfbt/RefPtr.h
@@ -214,8 +214,7 @@ public:
   RefPtr<T>&
   operator=(RefPtr<T> && aRefPtr)
   {
-    assign_assuming_AddRef(aRefPtr.mRawPtr);
-    aRefPtr.mRawPtr = nullptr;
+    assign_assuming_AddRef(aRefPtr.forget().take());
     return *this;
   }