From 8361c83e41cb4b2306010e3a77836769f0423328 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 18 Apr 2018 10:57:23 +0200
Subject: Add extra JS scope for DownloadUtils in urlbarBinding.xml to cater to
 global lexical scope.

---
 application/palemoon/base/content/urlbarBindings.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'application/palemoon/base/content')

diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index 6b4350f99..330a1b28a 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -990,9 +990,11 @@
         document.getAnonymousElementByAttribute(this, "anonid", "cancel");
       </field>
       <field name="DownloadUtils" readonly="true">
-        let utils = {};
-        Components.utils.import("resource://gre/modules/DownloadUtils.jsm", utils);
-        utils.DownloadUtils;
+        {
+          let utils = {};
+          Components.utils.import("resource://gre/modules/DownloadUtils.jsm", utils);
+          utils.DownloadUtils;
+        }
       </field>
 
       <method name="destroy">
-- 
cgit v1.2.3


From 8058e08926afc5ec6528d233cf8cc5f7404dad38 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Wed, 18 Apr 2018 07:22:38 -0400
Subject: [PALEMOON] Only use the private autocomplete binding on the URL bar

---
 application/palemoon/base/content/autocomplete.xml | 46 +++++++++++-----------
 application/palemoon/base/content/browser.css      | 40 +++++++++----------
 application/palemoon/base/content/browser.xul      |  4 +-
 .../palemoon/base/content/urlbarBindings.xml       | 16 ++++----
 4 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'application/palemoon/base/content')

diff --git a/application/palemoon/base/content/autocomplete.xml b/application/palemoon/base/content/autocomplete.xml
index 3cb80b19d..9291b205b 100644
--- a/application/palemoon/base/content/autocomplete.xml
+++ b/application/palemoon/base/content/autocomplete.xml
@@ -3,13 +3,13 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<bindings id="autocompleteBindings"
+<bindings id="privateAutocompleteBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="autocomplete" role="xul:combobox"
+  <binding id="private-autocomplete" role="xul:combobox"
            extends="chrome://global/content/bindings/textbox.xml#textbox">
     <resources>
       <stylesheet src="chrome://browser/content/autocomplete.css"/>
@@ -17,25 +17,25 @@
     </resources>
 
     <content sizetopopup="pref">
-      <xul:hbox class="autocomplete-textbox-container" flex="1" xbl:inherits="focused">
+      <xul:hbox class="private-autocomplete-textbox-container" flex="1" xbl:inherits="focused">
         <children includes="image|deck|stack|box">
-          <xul:image class="autocomplete-icon" allowevents="true"/>
+          <xul:image class="private-autocomplete-icon" allowevents="true"/>
         </children>
 
         <xul:hbox anonid="textbox-input-box" class="textbox-input-box" flex="1" xbl:inherits="tooltiptext=inputtooltiptext">
           <children/>
-          <html:input anonid="input" class="autocomplete-textbox textbox-input"
+          <html:input anonid="input" class="private-autocomplete-textbox textbox-input"
                       allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,value,type=inputtype,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,mozactionhint"/>
         </xul:hbox>
         <children includes="hbox"/>
       </xul:hbox>
 
-      <xul:dropmarker anonid="historydropmarker" class="autocomplete-history-dropmarker"
+      <xul:dropmarker anonid="historydropmarker" class="private-autocomplete-history-dropmarker"
                       allowevents="true"
                       xbl:inherits="open,enablehistory,parentfocused=focused"/>
 
-      <xul:popupset anonid="popupset" class="autocomplete-result-popupset"/>
+      <xul:popupset anonid="popupset" class="private-autocomplete-result-popupset"/>
 
       <children includes="toolbarbutton"/>
     </content>
@@ -656,7 +656,7 @@
     </handlers>
   </binding>
 
-  <binding id="autocomplete-result-popup" extends="chrome://browser/content/autocomplete.xml#autocomplete-base-popup">
+  <binding id="private-autocomplete-result-popup" extends="chrome://browser/content/autocomplete.xml#private-autocomplete-base-popup">
     <resources>
       <stylesheet src="chrome://browser/content/autocomplete.css"/>
       <stylesheet src="chrome://global/skin/tree.css"/>
@@ -664,11 +664,11 @@
     </resources>
 
     <content ignorekeys="true" level="top" consumeoutsideclicks="never">
-      <xul:tree anonid="tree" class="autocomplete-tree plain" hidecolumnpicker="true" flex="1" seltype="single">
+      <xul:tree anonid="tree" class="private-autocomplete-tree plain" hidecolumnpicker="true" flex="1" seltype="single">
         <xul:treecols anonid="treecols">
-          <xul:treecol id="treecolAutoCompleteValue" class="autocomplete-treecol" flex="1" overflow="true"/>
+          <xul:treecol id="treecolAutoCompleteValue" class="private-autocomplete-treecol" flex="1" overflow="true"/>
         </xul:treecols>
-        <xul:treechildren class="autocomplete-treebody"/>
+        <xul:treechildren class="private-autocomplete-treebody"/>
       </xul:tree>
     </content>
 
@@ -718,7 +718,7 @@
         <body>
           <![CDATA[
           var col = document.createElement("treecol");
-          col.setAttribute("class", "autocomplete-treecol");
+          col.setAttribute("class", "private-autocomplete-treecol");
           for (var name in aAttrs)
             col.setAttribute(name, aAttrs[name]);
           this.treecols.appendChild(col);
@@ -866,7 +866,7 @@
     </implementation>
   </binding>
 
-  <binding id="autocomplete-base-popup" role="none"
+  <binding id="private-autocomplete-base-popup" role="none"
 extends="chrome://global/content/bindings/popup.xml#popup">
     <implementation implements="nsIAutoCompletePopup">
       <field name="mInput">null</field>
@@ -1010,14 +1010,14 @@ extends="chrome://global/content/bindings/popup.xml#popup">
     </handlers>
   </binding>
 
-  <binding id="autocomplete-rich-result-popup" extends="chrome://browser/content/autocomplete.xml#autocomplete-base-popup">
+  <binding id="private-autocomplete-rich-result-popup" extends="chrome://browser/content/autocomplete.xml#private-autocomplete-base-popup">
     <resources>
       <stylesheet src="chrome://browser/content/autocomplete.css"/>
       <stylesheet src="chrome://browser/skin/autocomplete.css"/>
     </resources>
 
     <content ignorekeys="true" level="top" consumeoutsideclicks="never">
-      <xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox" flex="1"/>
+      <xul:richlistbox anonid="richlistbox" class="private-autocomplete-richlistbox" flex="1"/>
       <xul:hbox>
         <children/>
       </xul:hbox>
@@ -1270,7 +1270,7 @@ extends="chrome://global/content/bindings/popup.xml#popup">
             else {
               // set the class at the end so we can use the attributes
               // in the xbl constructor
-              item.className = "autocomplete-richlistitem";
+              item.className = "private-autocomplete-richlistitem";
               this.richlistbox.appendChild(item);
             }
 
@@ -1322,7 +1322,7 @@ extends="chrome://global/content/bindings/popup.xml#popup">
     </implementation>
   </binding>
 
-  <binding id="autocomplete-richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
+  <binding id="private-autocomplete-richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
     <content>
       <xul:hbox align="center" class="ac-title-box">
         <xul:image xbl:inherits="src=image" class="ac-site-icon"/>
@@ -2015,16 +2015,16 @@ extends="chrome://global/content/bindings/popup.xml#popup">
     </implementation>
   </binding>
 
-  <binding id="autocomplete-tree" extends="chrome://global/content/bindings/tree.xml#tree">
+  <binding id="private-autocomplete-tree" extends="chrome://global/content/bindings/tree.xml#tree">
     <content>
       <children includes="treecols"/>
-      <xul:treerows class="autocomplete-treerows tree-rows" xbl:inherits="hidescrollbar" flex="1">
+      <xul:treerows class="private-autocomplete-treerows tree-rows" xbl:inherits="hidescrollbar" flex="1">
         <children/>
       </xul:treerows>
     </content>
   </binding>
 
-  <binding id="autocomplete-richlistbox" extends="chrome://global/content/bindings/richlistbox.xml#richlistbox">
+  <binding id="private-autocomplete-richlistbox" extends="chrome://global/content/bindings/richlistbox.xml#richlistbox">
     <implementation>
       <field name="mLastMoveTime">Date.now()</field>
       <field name="mouseSelectedIndex">-1</field>
@@ -2068,7 +2068,7 @@ extends="chrome://global/content/bindings/popup.xml#popup">
     </handlers>
   </binding>
 
-  <binding id="autocomplete-treebody">
+  <binding id="private-autocomplete-treebody">
     <implementation>
       <field name="mLastMoveTime">Date.now()</field>
     </implementation>
@@ -2093,7 +2093,7 @@ extends="chrome://global/content/bindings/popup.xml#popup">
     </handlers>
   </binding>
 
-  <binding id="autocomplete-treerows">
+  <binding id="private-autocomplete-treerows">
     <content>
       <xul:hbox flex="1" class="tree-bodybox">
         <children/>
@@ -2102,7 +2102,7 @@ extends="chrome://global/content/bindings/popup.xml#popup">
     </content>
   </binding>
 
-  <binding id="history-dropmarker" extends="chrome://global/content/bindings/general.xml#dropmarker">
+  <binding id="private-history-dropmarker" extends="chrome://global/content/bindings/general.xml#dropmarker">
     <implementation>
       <method name="showPopup">
         <body><![CDATA[
diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index a72d77488..91ae9aa18 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -328,56 +328,54 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
   visibility: hidden;
 }
 
-/* Override xul.css for autocomplete bindings and css */
-textbox[type="autocomplete"] {
+/* Private Autocomplete */
+textbox[type="private-autocomplete"] {
   -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete");
 }
 
-panel[type="autocomplete"] {
+panel[type="private-autocomplete"] {
   -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-result-popup");
 }
 
-panel[type="autocomplete-richlistbox"] {
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-rich-result-popup");
+panel[type="private-autocomplete-richlistbox"] {
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-autocomplete-rich-result-popup");
 }
 
-/* FIXME: bug 616258 */
-
-.autocomplete-tree {
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-tree");
+.private-autocomplete-tree {
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-autocomplete-tree");
   -moz-user-focus: ignore;
 }
 
-.autocomplete-treebody {
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-treebody");
+.private-autocomplete-treebody {
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-autocomplete-treebody");
 }
 
-.autocomplete-richlistbox {
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-richlistbox");
+.private-autocomplete-richlistbox {
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-autocomplete-richlistbox");
   -moz-user-focus: ignore;
 }
 
-.autocomplete-richlistbox > scrollbox {
+.private-autocomplete-richlistbox > scrollbox {
   overflow-x: hidden !important;
 }
 
-.autocomplete-richlistitem {
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-richlistitem");
+.private-autocomplete-richlistitem {
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-autocomplete-richlistitem");
   -moz-box-orient: vertical;
   overflow: -moz-hidden-unscrollable;
 }
 
-.autocomplete-treerows {
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#autocomplete-treerows");
+.private-autocomplete-treerows {
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-autocomplete-treerows");
 }
 
-.autocomplete-history-dropmarker {
+.private-autocomplete-history-dropmarker {
   display: none;
 }
 
-.autocomplete-history-dropmarker[enablehistory="true"] {
+.private-autocomplete-history-dropmarker[enablehistory="true"] {
   display: -moz-box;
-  -moz-binding: url("chrome://browser/content/autocomplete.xml#history-dropmarker");
+  -moz-binding: url("chrome://browser/content/autocomplete.xml#private-history-dropmarker");
 }
 
 .ac-ellipsis-after {
diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul
index ea9c3f969..11c4f16f9 100644
--- a/application/palemoon/base/content/browser.xul
+++ b/application/palemoon/base/content/browser.xul
@@ -128,9 +128,11 @@
 
     <!-- for search and content formfill/pw manager -->
     <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
+    <panel type="private-autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 
     <!-- for url bar autocomplete -->
     <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+    <panel type="private-autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
     <!-- for date/time picker. consumeoutsideclicks is set to never, so that
          clicks on the anchored input box are never consumed. -->
@@ -427,7 +429,7 @@
                    title="&locationItem.title;" class="chromeclass-location" removable="true">
         <textbox id="urlbar" flex="1"
                  placeholder=""
-                 type="autocomplete"
+                 type="private-autocomplete"
                  autocompletesearch="urlinline history"
                  autocompletesearchparam="enable-actions"
                  autocompletepopup="PopupAutoCompleteRichResult"
diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index 330a1b28a..75411f39b 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -17,32 +17,32 @@
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="urlbar" extends="chrome://browser/content/autocomplete.xml#autocomplete">
+  <binding id="urlbar" extends="chrome://browser/content/autocomplete.xml#private-autocomplete">
 
     <content sizetopopup="pref">
       <xul:hbox anonid="textbox-container"
-                class="autocomplete-textbox-container urlbar-textbox-container"
+                class="private-autocomplete-textbox-container urlbar-textbox-container"
                 flex="1" xbl:inherits="focused">
         <children includes="image|deck|stack|box">
-          <xul:image class="autocomplete-icon" allowevents="true"/>
+          <xul:image class="private-autocomplete-icon" allowevents="true"/>
         </children>
         <xul:hbox anonid="textbox-input-box"
                   class="textbox-input-box urlbar-input-box"
                   flex="1" xbl:inherits="tooltiptext=inputtooltiptext">
           <children/>
           <html:input anonid="input"
-                      class="autocomplete-textbox urlbar-input textbox-input uri-element-right-align"
+                      class="private-autocomplete-textbox urlbar-input textbox-input uri-element-right-align"
                       allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
         </xul:hbox>
         <children includes="hbox"/>
       </xul:hbox>
       <xul:dropmarker anonid="historydropmarker"
-                      class="autocomplete-history-dropmarker urlbar-history-dropmarker"
+                      class="private-autocomplete-history-dropmarker urlbar-history-dropmarker"
                       allowevents="true"
                       xbl:inherits="open,enablehistory,parentfocused=focused"/>
       <xul:popupset anonid="popupset"
-                    class="autocomplete-result-popupset"/>
+                    class="private-autocomplete-result-popupset"/>
       <children includes="toolbarbutton"/>
     </content>
 
@@ -769,7 +769,7 @@
   </binding>
 
   <!-- Note: this binding is applied to the autocomplete popup used in the Search bar and in web page content -->
-  <binding id="browser-autocomplete-result-popup" extends="chrome://browser/content/autocomplete.xml#autocomplete-result-popup">
+  <binding id="browser-autocomplete-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
     <implementation>
       <method name="openAutocompletePopup">
         <parameter name="aInput"/>
@@ -823,7 +823,7 @@
       </implementation>
     </binding>
 
-    <binding id="urlbar-rich-result-popup" extends="chrome://browser/content/autocomplete.xml#autocomplete-rich-result-popup">
+    <binding id="urlbar-rich-result-popup" extends="chrome://browser/content/autocomplete.xml#private-autocomplete-rich-result-popup">
       <implementation>
       <field name="_maxResults">0</field>
 
-- 
cgit v1.2.3