From 984dad43ae49ba1cfa236af5567bf4c934e59263 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Fri, 1 Jun 2018 21:32:59 -0400
Subject: Update Readability from mozilla-central release branch (FF 60.0).

---
 toolkit/components/reader/JSDOMParser.js  | 21 ++++++++--
 toolkit/components/reader/Readability.js  | 67 ++++++++++++++++++-------------
 toolkit/components/reader/ReaderWorker.js |  2 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/reader/JSDOMParser.js b/toolkit/components/reader/JSDOMParser.js
index 38f59c4ea..dd9d37230 100644
--- a/toolkit/components/reader/JSDOMParser.js
+++ b/toolkit/components/reader/JSDOMParser.js
@@ -560,7 +560,8 @@
     },
   };
 
-  var Document = function () {
+  var Document = function (url) {
+    this.documentURI = url;
     this.styleSheets = [];
     this.childNodes = [];
     this.children = [];
@@ -600,6 +601,20 @@
       node.textContent = text;
       return node;
     },
+
+    get baseURI() {
+      if (!this.hasOwnProperty("_baseURI")) {
+        this._baseURI = this.documentURI;
+        var baseElements = this.getElementsByTagName("base");
+        var href = baseElements[0] && baseElements[0].getAttribute("href");
+        if (href) {
+          try {
+            this._baseURI = (new URL(href, this._baseURI)).href;
+          } catch (ex) {/* Just fall back to documentURI */}
+        }
+      }
+      return this._baseURI;
+    },
   };
 
   var Element = function (tag) {
@@ -1118,9 +1133,9 @@
     /**
      * Parses an HTML string and returns a JS implementation of the Document.
      */
-    parse: function (html) {
+    parse: function (html, url) {
       this.html = html;
-      var doc = this.doc = new Document();
+      var doc = this.doc = new Document(url);
       this.readChildren(doc);
 
       // If this is an HTML document, remove root-level children except for the
diff --git a/toolkit/components/reader/Readability.js b/toolkit/components/reader/Readability.js
index 04949dc61..064d2ae88 100644
--- a/toolkit/components/reader/Readability.js
+++ b/toolkit/components/reader/Readability.js
@@ -41,6 +41,7 @@ function Readability(uri, doc, options) {
   this._articleTitle = null;
   this._articleByline = null;
   this._articleDir = null;
+  this._attempts = [];
 
   // Configurable options
   this._debug = !!options.debug;
@@ -275,34 +276,20 @@ Readability.prototype = {
    * @return void
    */
   _fixRelativeUris: function(articleContent) {
-    var scheme = this._uri.scheme;
-    var prePath = this._uri.prePath;
-    var pathBase = this._uri.pathBase;
-
+    var baseURI = this._doc.baseURI;
+    var documentURI = this._doc.documentURI;
     function toAbsoluteURI(uri) {
-      // If this is already an absolute URI, return it.
-      if (/^[a-zA-Z][a-zA-Z0-9\+\-\.]*:/.test(uri))
-        return uri;
-
-      // Scheme-rooted relative URI.
-      if (uri.substr(0, 2) == "//")
-        return scheme + "://" + uri.substr(2);
-
-      // Prepath-rooted relative URI.
-      if (uri[0] == "/")
-        return prePath + uri;
-
-      // Dotslash relative URI.
-      if (uri.indexOf("./") === 0)
-        return pathBase + uri.slice(2);
-
-      // Ignore hash URIs:
-      if (uri[0] == "#")
+      // Leave hash links alone if the base URI matches the document URI:
+      if (baseURI == documentURI && uri.charAt(0) == "#") {
         return uri;
-
-      // Standard relative URI; add entire path. pathBase already includes a
-      // trailing "/".
-      return pathBase + uri;
+      }
+      // Otherwise, resolve against base URI:
+      try {
+        return new URL(uri, baseURI).href;
+      } catch (ex) {
+        // Something went wrong, just return the original:
+      }
+      return uri;
     }
 
     var links = articleContent.getElementsByTagName("a");
@@ -535,6 +522,7 @@ Readability.prototype = {
     this._clean(articleContent, "embed");
     this._clean(articleContent, "h1");
     this._clean(articleContent, "footer");
+    this._clean(articleContent, "link");
 
     // Clean out elements have "share" in their id/class combinations from final top candidates,
     // which means we don't remove the top candidates even they have "share".
@@ -1089,24 +1077,45 @@ Readability.prototype = {
       if (this._debug)
         this.log("Article content after paging: " + articleContent.innerHTML);
 
+      var parseSuccessful = true;
+
       // Now that we've gone through the full algorithm, check to see if
       // we got any meaningful content. If we didn't, we may need to re-run
       // grabArticle with different flags set. This gives us a higher likelihood of
       // finding the content, and the sieve approach gives us a higher likelihood of
       // finding the -right- content.
-      if (this._getInnerText(articleContent, true).length < this._wordThreshold) {
+      var textLength = this._getInnerText(articleContent, true).length;
+      if (textLength < this._wordThreshold) {
+        parseSuccessful = false;
         page.innerHTML = pageCacheHtml;
 
         if (this._flagIsActive(this.FLAG_STRIP_UNLIKELYS)) {
           this._removeFlag(this.FLAG_STRIP_UNLIKELYS);
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
         } else if (this._flagIsActive(this.FLAG_WEIGHT_CLASSES)) {
           this._removeFlag(this.FLAG_WEIGHT_CLASSES);
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
         } else if (this._flagIsActive(this.FLAG_CLEAN_CONDITIONALLY)) {
           this._removeFlag(this.FLAG_CLEAN_CONDITIONALLY);
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
         } else {
-          return null;
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
+          // No luck after removing flags, just return the longest text we found during the different loops
+          this._attempts.sort(function (a, b) {
+            return a.textLength < b.textLength;
+          });
+
+          // But first check if we actually have something
+          if (!this._attempts[0].textLength) {
+            return null;
+          }
+
+          articleContent = this._attempts[0].articleContent;
+          parseSuccessful = true;
         }
-      } else {
+      }
+
+      if (parseSuccessful) {
         // Find out text direction from ancestors of final top candidate.
         var ancestors = [parentOfTopCandidate, topCandidate].concat(this._getNodeAncestors(parentOfTopCandidate));
         this._someNode(ancestors, function(ancestor) {
diff --git a/toolkit/components/reader/ReaderWorker.js b/toolkit/components/reader/ReaderWorker.js
index 9ae589d7d..69426788b 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/toolkit/components/reader/ReaderWorker.js
@@ -47,7 +47,7 @@ var Agent = {
    * @return {object} Article object returned from Readability.
    */
   parseDocument(uri, serializedDoc, options) {
-    let doc = new JSDOMParser().parse(serializedDoc);
+    let doc = new JSDOMParser().parse(serializedDoc, uri.spec);
     return new Readability(uri, doc, options).parse();
   },
 };
-- 
cgit v1.2.3


From 1f50e1c476a287692847d7d8f94a903517b727a7 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Sun, 24 Jun 2018 12:18:48 +0200
Subject: Preferences - Saved Passwords - "Remove" button should not be active
 if there are no items

---
 toolkit/components/passwordmgr/content/passwordManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js
index da63d7de8..bd5cebfc4 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -326,7 +326,7 @@ function LoadSignons() {
 function GetTreeSelections() {
   let selections = [];
   let select = signonsTree.view.selection;
-  if (select) {
+  if (select && signonsTree.view.rowCount > 0) {
     let count = select.getRangeCount();
     let min = {};
     let max = {};
-- 
cgit v1.2.3


From bbbb74e5f077b47c6adb8ede13bfb001bb966cdb Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 13:23:24 -0400
Subject: Make the Error Console accessible from about:console

---
 toolkit/components/console/content/console.xul | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 0abd0a981..9233fef96 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -77,6 +77,7 @@
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
+      <toolbarspring/>
     </toolbar>
 
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
@@ -91,11 +92,9 @@
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
 
-  <statusbar>
-    <statusbarpanel flex="1" pack="start">
-      <label value="&filter2.label;" control="Filter"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
-    </statusbarpanel>
-  </statusbar>
+  <toolbar align="center" nowindowdrag="true">
+    <label value="&filter2.label;" control="Filter"/>
+    <textbox accesskey="&filter2.accesskey;" type="search"
+             id="Filter" oncommand="changeFilter();"/>
+  </toolbar>
 </window>
-- 
cgit v1.2.3


From 2cdd998f8d35ad8fdcffaf8d0b006a2e180e5d18 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 13:43:46 -0400
Subject: Move the Error Console search box to the eval toolbar

---
 toolkit/components/console/content/console.xul | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 9233fef96..d326081e1 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -85,16 +85,12 @@
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
       <toolbarbutton id="ButtonEval" label="&evaluate.label;"
                      accesskey="&evaluate.accesskey;" oncommand="evaluateTypein()"/>
+      <textbox accesskey="&filter2.accesskey;" type="search"
+               id="Filter" oncommand="changeFilter();"/>
     </toolbar>
   </toolbox>
 
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
-
-  <toolbar align="center" nowindowdrag="true">
-    <label value="&filter2.label;" control="Filter"/>
-    <textbox accesskey="&filter2.accesskey;" type="search"
-             id="Filter" oncommand="changeFilter();"/>
-  </toolbar>
 </window>
-- 
cgit v1.2.3


From 02d374dbe66a17f5942e0148b9dfda780a4b1f56 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 13:55:58 -0400
Subject: Revert "Move the Error Console search box to the eval toolbar"

This reverts commit 2cdd998f8d35ad8fdcffaf8d0b006a2e180e5d18.
---
 toolkit/components/console/content/console.xul | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index d326081e1..9233fef96 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -85,12 +85,16 @@
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
       <toolbarbutton id="ButtonEval" label="&evaluate.label;"
                      accesskey="&evaluate.accesskey;" oncommand="evaluateTypein()"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
     </toolbar>
   </toolbox>
 
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
+
+  <toolbar align="center" nowindowdrag="true">
+    <label value="&filter2.label;" control="Filter"/>
+    <textbox accesskey="&filter2.accesskey;" type="search"
+             id="Filter" oncommand="changeFilter();"/>
+  </toolbar>
 </window>
-- 
cgit v1.2.3


From baf849c626e3633105f1cdfefa991e1aa41f0071 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 13:56:27 -0400
Subject: Revert "Make the Error Console accessible from about:console"

This reverts commit bbbb74e5f077b47c6adb8ede13bfb001bb966cdb.
---
 toolkit/components/console/content/console.xul | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 9233fef96..0abd0a981 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -77,7 +77,6 @@
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
-      <toolbarspring/>
     </toolbar>
 
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
@@ -92,9 +91,11 @@
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
 
-  <toolbar align="center" nowindowdrag="true">
-    <label value="&filter2.label;" control="Filter"/>
-    <textbox accesskey="&filter2.accesskey;" type="search"
-             id="Filter" oncommand="changeFilter();"/>
-  </toolbar>
+  <statusbar>
+    <statusbarpanel flex="1" pack="start">
+      <label value="&filter2.label;" control="Filter"/>
+      <textbox accesskey="&filter2.accesskey;" type="search"
+               id="Filter" oncommand="changeFilter();"/>
+    </statusbarpanel>
+  </statusbar>
 </window>
-- 
cgit v1.2.3


From 015922d371376b5171bc2a5aa72cb69100ef6806 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 14:02:33 -0400
Subject: Make the Error Console accessible from about:console and make it
 presentable in that context

---
 toolkit/components/console/content/console.xul | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 0abd0a981..90b900cf9 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -77,9 +77,12 @@
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
+      <toolbarspring/>
     </toolbar>
 
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
+      <label value="&filter2.label;" control="Filter"/>
+      <textbox accesskey="&filter2.accesskey;" type="search" id="Filter" oncommand="changeFilter();"/>
       <label value="&codeEval.label;" accesskey="&codeEval.accesskey;" control="TextboxEval"/>
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
       <toolbarbutton id="ButtonEval" label="&evaluate.label;"
@@ -90,12 +93,4 @@
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
-
-  <statusbar>
-    <statusbarpanel flex="1" pack="start">
-      <label value="&filter2.label;" control="Filter"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
-    </statusbarpanel>
-  </statusbar>
 </window>
-- 
cgit v1.2.3


From fd4f7960e56b22cd6fe2f2dc34b3994da1ccc79c Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 16:21:28 -0400
Subject: Cleanup WebExAM test dependencies

---
 toolkit/components/telemetry/tests/unit/xpcshell.ini | 1 -
 1 file changed, 1 deletion(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini
index fe58d362e..42354c4cd 100644
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -15,7 +15,6 @@ support-files =
   system.xpi
   restartless.xpi
   theme.xpi
-  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
   experiment.xpi
-- 
cgit v1.2.3


From 7664308ab16560fc25622ef68810300233d39fa9 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 28 Jun 2018 15:50:23 -0400
Subject: Add  HYPE_ICEWEASEL where appropriate

---
 toolkit/components/passwordmgr/content/passwordManager.js  | 4 +++-
 toolkit/components/passwordmgr/content/passwordManager.xul | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js
index bd5cebfc4..327ebbdf8 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -727,10 +727,12 @@ function escapeKeyHandler() {
   window.close();
 }
 
-#if defined(MC_BASILISK) && defined(XP_WIN)
+#ifdef XP_WIN
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
 function OpenMigrator() {
   const { MigrationUtils } = Cu.import("resource:///modules/MigrationUtils.jsm", {});
   // We pass in the type of source we're using for use in telemetry:
   MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS]);
 }
 #endif
+#endif
diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul
index c0a10bf8e..8590d96ac 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -112,10 +112,12 @@
       <button id="removeAllSignons" icon="clear"
               oncommand="DeleteAllSignons();"/>
       <spacer flex="1"/>
-#if defined(MC_BASILISK) && defined(XP_WIN)
+#ifdef XP_WIN
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
       <button accesskey="&import.accesskey;"
               label="&import.label;"
               oncommand="OpenMigrator();"/>
+#endif
 #endif
       <button id="togglePasswords"
               oncommand="TogglePasswordVisible();"/>
-- 
cgit v1.2.3


From 535e9399e6a57eafa478c26055339778f2b0c661 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 29 Jun 2018 17:40:01 +0200
Subject: Remove SSL Error Reporting telemetry

---
 toolkit/components/moz.build                       |   1 -
 .../securityreporter/SecurityReporter.js           | 112 ---------------------
 .../securityreporter/SecurityReporter.manifest     |   2 -
 toolkit/components/securityreporter/moz.build      |  16 ---
 .../securityreporter/nsISecurityReporter.idl       |  14 ---
 5 files changed, 145 deletions(-)
 delete mode 100644 toolkit/components/securityreporter/SecurityReporter.js
 delete mode 100644 toolkit/components/securityreporter/SecurityReporter.manifest
 delete mode 100644 toolkit/components/securityreporter/moz.build
 delete mode 100644 toolkit/components/securityreporter/nsISecurityReporter.idl

(limited to 'toolkit/components')

diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index c11f62792..953e6c6e3 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -51,7 +51,6 @@ DIRS += [
     'reader',
     'remotebrowserutils',
     'reflect',
-    'securityreporter',
     'sqlite',
     'startup',
     'statusfilter',
diff --git a/toolkit/components/securityreporter/SecurityReporter.js b/toolkit/components/securityreporter/SecurityReporter.js
deleted file mode 100644
index 9ca1e5546..000000000
--- a/toolkit/components/securityreporter/SecurityReporter.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-const { classes: Cc, interfaces: Ci, utils: Cu} = Components;
-
-Cu.importGlobalProperties(['fetch']);
-
-const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const protocolHandler = Cc["@mozilla.org/network/protocol;1?name=http"]
-                          .getService(Ci.nsIHttpProtocolHandler);
-const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-
-const TLS_ERROR_REPORT_TELEMETRY_SUCCESS = 6;
-const TLS_ERROR_REPORT_TELEMETRY_FAILURE = 7;
-const HISTOGRAM_ID = "TLS_ERROR_REPORT_UI";
-
-
-XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
-                                  "resource://gre/modules/UpdateUtils.jsm");
-
-function getDERString(cert)
-{
-  var length = {};
-  var derArray = cert.getRawDER(length);
-  var derString = '';
-  for (var i = 0; i < derArray.length; i++) {
-    derString += String.fromCharCode(derArray[i]);
-  }
-  return derString;
-}
-
-function SecurityReporter() { }
-
-SecurityReporter.prototype = {
-  classDescription: "Security reporter component",
-  classID:          Components.ID("{8a997c9a-bea1-11e5-a1fa-be6aBc8e7f8b}"),
-  contractID:       "@mozilla.org/securityreporter;1",
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISecurityReporter]),
-  reportTLSError: function(transportSecurityInfo, hostname, port) {
-    // don't send if there's no transportSecurityInfo (since the report cannot
-    // contain anything of interest)
-    if (!transportSecurityInfo) {
-      return;
-    }
-
-    // don't send a report if the pref is not enabled
-    if (!Services.prefs.getBoolPref("security.ssl.errorReporting.enabled")) {
-      return;
-    }
-
-    // Don't send a report if the host we're connecting to is the report
-    // server (otherwise we'll get loops when this fails)
-    let endpoint =
-      Services.prefs.getCharPref("security.ssl.errorReporting.url");
-    let reportURI = Services.io.newURI(endpoint, null, null);
-
-    if (reportURI.host == hostname) {
-      return;
-    }
-
-    // Convert the nsIX509CertList into a format that can be parsed into
-    // JSON
-    let asciiCertChain = [];
-
-    if (transportSecurityInfo.failedCertChain) {
-      let certs = transportSecurityInfo.failedCertChain.getEnumerator();
-      while (certs.hasMoreElements()) {
-        let cert = certs.getNext();
-        cert.QueryInterface(Ci.nsIX509Cert);
-        asciiCertChain.push(btoa(getDERString(cert)));
-      }
-    }
-
-    let report = {
-      hostname: hostname,
-      port: port,
-      timestamp: Math.round(Date.now() / 1000),
-      errorCode: transportSecurityInfo.errorCode,
-      failedCertChain: asciiCertChain,
-      userAgent: protocolHandler.userAgent,
-      version: 1,
-      build: Services.appinfo.appBuildID,
-      product: Services.appinfo.name,
-      channel: UpdateUtils.UpdateChannel
-    }
-
-    fetch(endpoint, {
-      method: "POST",
-      body: JSON.stringify(report),
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    }).then(function (aResponse) {
-      if (!aResponse.ok) {
-        // request returned non-success status
-        Services.telemetry.getHistogramById(HISTOGRAM_ID)
-          .add(TLS_ERROR_REPORT_TELEMETRY_FAILURE);
-      } else {
-        Services.telemetry.getHistogramById(HISTOGRAM_ID)
-          .add(TLS_ERROR_REPORT_TELEMETRY_SUCCESS);
-      }
-    }).catch(function (e) {
-      // error making request to reportURL
-      Services.telemetry.getHistogramById(HISTOGRAM_ID)
-          .add(TLS_ERROR_REPORT_TELEMETRY_FAILURE);
-    });
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SecurityReporter]);
diff --git a/toolkit/components/securityreporter/SecurityReporter.manifest b/toolkit/components/securityreporter/SecurityReporter.manifest
deleted file mode 100644
index d4e080dc7..000000000
--- a/toolkit/components/securityreporter/SecurityReporter.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {8a997c9a-bea1-11e5-a1fa-be6aBc8e7f8b} SecurityReporter.js
-contract @mozilla.org/securityreporter;1 {8a997c9a-bea1-11e5-a1fa-be6aBc8e7f8b}
diff --git a/toolkit/components/securityreporter/moz.build b/toolkit/components/securityreporter/moz.build
deleted file mode 100644
index 7ef56a115..000000000
--- a/toolkit/components/securityreporter/moz.build
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-XPIDL_MODULE = 'toolkit_securityreporter'
-
-XPIDL_SOURCES += [
-    'nsISecurityReporter.idl',
-]
-
-EXTRA_COMPONENTS += [
-    'SecurityReporter.js',
-    'SecurityReporter.manifest',
-]
diff --git a/toolkit/components/securityreporter/nsISecurityReporter.idl b/toolkit/components/securityreporter/nsISecurityReporter.idl
deleted file mode 100644
index 462dd1e48..000000000
--- a/toolkit/components/securityreporter/nsISecurityReporter.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-#include "nsISupports.idl"
-#include "nsITransportSecurityInfo.idl"
-
-[scriptable, uuid(8a997c9a-bea1-11e5-a1fa-be6aBc8e7f8b)]
-interface nsISecurityReporter : nsISupports
-{
-  void reportTLSError(in nsITransportSecurityInfo aSecurityInfo,
-                      in AUTF8String aHostname,
-                      in long aPort);
-};
-- 
cgit v1.2.3


From e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 2 Jul 2018 19:05:56 +0200
Subject: Prevent suppressing executable warnings using the "don't ask me this
 again" checkbox.

A hidden preference matching the behavior of "browser.download.manager.alertOnEXEOpen" is kept, but is renamed in order to recover cases where the checkbox was used accidentally.
While there, simplify the `confirmLaunchExecutable` function by converting from promises to async function.
Since Basilisk moved this prompting to toolkit, we also clean up some unused duplicate strings from application/basilisk while we're there.

This resolves #581
---
 .../jsdownloads/src/DownloadUIHelper.jsm           | 51 ++++++++--------------
 1 file changed, 17 insertions(+), 34 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
index 5bd351ee9..ce165205b 100644
--- a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
@@ -124,52 +124,35 @@ this.DownloadPrompter.prototype = {
 
   /**
    * Displays a warning message box that informs that the specified file is
-   * executable, and asks whether the user wants to launch it.  The user is
-   * given the option of disabling future instances of this warning.
+   * executable, and asks whether the user wants to launch it.
    *
    * @param aPath
    *        String containing the full path to the file to be opened.
    *
-   * @return {Promise}
    * @resolves Boolean indicating whether the launch operation can continue.
-   * @rejects JavaScript exception.
    */
-  confirmLaunchExecutable: function (aPath)
+  async confirmLaunchExecutable: function (aPath)
   {
-    const kPrefAlertOnEXEOpen = "browser.download.manager.alertOnEXEOpen";
+    const kPrefConfirmOpenExe = "browser.download.confirmOpenExecutable";
 
-    try {
-      // Always launch in case we have no prompter implementation.
-      if (!this._prompter) {
-        return Promise.resolve(true);
-      }
-
-      try {
-        if (!Services.prefs.getBoolPref(kPrefAlertOnEXEOpen)) {
-          return Promise.resolve(true);
-        }
-      } catch (ex) {
-        // If the preference does not exist, continue with the prompt.
-      }
-
-      let leafName = OS.Path.basename(aPath);
-
-      let s = DownloadUIHelper.strings;
-      let checkState = { value: false };
-      let shouldLaunch = this._prompter.confirmCheck(
-                           s.fileExecutableSecurityWarningTitle,
-                           s.fileExecutableSecurityWarning(leafName, leafName),
-                           s.fileExecutableSecurityWarningDontAsk,
-                           checkState);
+    // Always launch in case we have no prompter implementation.
+    if (!this._prompter) {
+      return true;
+    }
 
-      if (shouldLaunch) {
-        Services.prefs.setBoolPref(kPrefAlertOnEXEOpen, !checkState.value);
+    try {
+      if (!Services.prefs.getBoolPref(kPrefConfirmOpenExe)) {
+        return true;
       }
-
-      return Promise.resolve(shouldLaunch);
     } catch (ex) {
-      return Promise.reject(ex);
+      // If the preference does not exist, continue with the prompt.
     }
+
+    let leafName = OS.Path.basename(aPath);
+
+    let s = DownloadUIHelper.strings;
+    return this._prompter.confirm(s.fileExecutableSecurityWarningTitle,
+                                  s.fileExecutableSecurityWarning(leafName, leafName));
   },
 
   /**
-- 
cgit v1.2.3


From 4b76d6427a6650a499f8840fb8b054be70dd1c35 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 3 Jul 2018 04:16:11 +0200
Subject: Re-implement prompts.tab_modal.focusSwitch control in toolkit.

---
 toolkit/components/prompts/src/nsPrompter.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js
index 26efe28cc..0503b5925 100644
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/toolkit/components/prompts/src/nsPrompter.js
@@ -369,7 +369,13 @@ function openTabPrompt(domWin, tabPrompt, args) {
                          .getInterface(Ci.nsIDocShell);
     let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload;
     let eventDetail = Cu.cloneInto({tabPrompt: true, inPermitUnload}, domWin);
-    PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail);
+    let allowFocusSwitch = true;
+    try {
+      allowFocusSwitch = Services.prefs.getBoolPref("prompts.tab_modal.focusSwitch");
+    } catch(e) {}
+    
+    if (allowFocusSwitch)    
+      PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail);
 
     let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor)
                          .getInterface(Ci.nsIDOMWindowUtils);
@@ -395,8 +401,8 @@ function openTabPrompt(domWin, tabPrompt, args) {
         frameMM.removeEventListener("pagehide", pagehide, true);
 
         winUtils.leaveModalState();
-
-        PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed");
+        if (allowFocusSwitch)
+          PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed");
     }
 
     frameMM.addEventListener("pagehide", pagehide, true);
-- 
cgit v1.2.3


From de85309fb1db7895b985440a3d998cea726b561a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 4 Jul 2018 23:58:35 +0200
Subject: On failure, save a dummy file from the background page thumb capture
 module.

If a background page thumbnail capture fails (e.g. due to too heavy scripting), we should
write -something- to the thumbnail cache, because otherwise it will try again and again,
which is problematic for bad trap pages, that even if the user has left the page never
to return again, the thumbnail service may still try to capture, and fail.

This resolves the only problem for us in #592.
---
 toolkit/components/thumbnails/BackgroundPageThumbs.jsm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
index fded51cea..bd52e77e9 100644
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -468,7 +468,12 @@ Capture.prototype = {
     };
 
     if (!data) {
-      done();
+      // If this background attempt failed, cause a dummy file to be saved, so
+      // that gets loaded instead of attempting again (and again).
+      // XXX: Perhaps we can create a placeholder image to use instead of "null"
+      // here, so it has something to show to the user?
+      PageThumbs._store(this.url, this.url, null, true)
+                .then(done, done);
       return;
     }
 
-- 
cgit v1.2.3


From caa2ac23c3b669e77890d9ee62ce7865be5c2190 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Wed, 4 Jul 2018 21:25:02 -0400
Subject: Fix local link handling in Reader Mode.

---
 toolkit/components/reader/AboutReader.jsm | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index fb82e5789..c5d04476d 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -200,9 +200,6 @@ AboutReader.prototype = {
         } else if (!target.closest(".dropdown-popup")) {
           this._closeDropdowns();
         }
-        if (target.tagName == "A" && !target.classList.contains("reader-domain")) {
-          this._linkClicked(aEvent);
-        }
         break;
       case "scroll":
         this._closeDropdowns(true);
@@ -720,6 +717,21 @@ AboutReader.prototype = {
     }
   },
 
+  _fixLocalLinks() {
+    // We need to do this because preprocessing the content through nsIParserUtils
+    // gives back a DOM with a <base> element. That influences how these URLs get
+    // resolved, making them no longer match the document URI (which is
+    // about:reader?url=...). To fix this, make all the hash URIs absolute. This
+    // is hacky, but the alternative of removing the base element has potential
+    // security implications if Readability has not successfully made all the URLs
+    // absolute, so we pick just fixing these in-document links explicitly.
+    let localLinks = this._contentElement.querySelectorAll("a[href^='#']");
+    for (let localLink of localLinks) {
+      // Have to get the attribute because .href provides an absolute URI.
+      localLink.href = this._doc.documentURI + localLink.getAttribute("href");
+    }
+  },
+
   _formatReadTime(slowEstimate, fastEstimate) {
     let displayStringKey = "aboutReader.estimatedReadTimeRange1";
 
@@ -790,6 +802,7 @@ AboutReader.prototype = {
       false, articleUri, this._contentElement);
     this._contentElement.innerHTML = "";
     this._contentElement.appendChild(contentFragment);
+    this._fixLocalLinks();
     this._maybeSetTextDirection(article);
     this._foundLanguage(article.language);
 
@@ -977,18 +990,6 @@ AboutReader.prototype = {
     }
   },
 
-  /*
-   * Override link handling for same-page references so we don't exit Reader View.
-   */
-  _linkClicked(event) {
-    var originalUrl = Services.io.newURI(this._getOriginalUrl(), null, null);
-    var targetUrl = Services.io.newURI(event.target.href, null, null);
-    if (originalUrl.specIgnoringRef == targetUrl.specIgnoringRef) {
-      event.preventDefault();
-      this._goToReference(targetUrl.ref);
-    }
-  },
-
   /*
    * Scroll reader view to a reference
    */
-- 
cgit v1.2.3


From dac5ea478509d939c7f0f51e95d0989a156e6f11 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Wed, 4 Jul 2018 21:25:41 -0400
Subject: Remove telemetry from NarrateControls.jsm.

---
 toolkit/components/narrate/NarrateControls.jsm | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index be3ce636c..56b3deaf8 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -10,7 +10,6 @@ Cu.import("resource://gre/modules/narrate/VoiceSelect.jsm");
 Cu.import("resource://gre/modules/narrate/Narrator.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AsyncPrefs.jsm");
-Cu.import("resource://gre/modules/TelemetryStopwatch.jsm");
 
 this.EXPORTED_SYMBOLS = ["NarrateControls"];
 
@@ -147,11 +146,6 @@ NarrateControls.prototype = {
       case "voiceschanged":
         this._setupVoices();
         break;
-      case "unload":
-        if (this.narrator.speaking) {
-          TelemetryStopwatch.finish("NARRATE_CONTENT_SPEAKTIME_MS", this);
-        }
-        break;
     }
   },
 
@@ -187,20 +181,9 @@ NarrateControls.prototype = {
       }
 
       let narrateToggle = win.document.querySelector(".narrate-toggle");
-      let histogram = Services.telemetry.getKeyedHistogramById(
-        "NARRATE_CONTENT_BY_LANGUAGE_2");
       let initial = !this._voicesInitialized;
       this._voicesInitialized = true;
 
-      if (initial) {
-        histogram.add(language, 0);
-      }
-
-      if (options.length && narrateToggle.hidden) {
-        // About to show for the first time..
-        histogram.add(language, 1);
-      }
-
       // We disable this entire feature if there are no available voices.
       narrateToggle.hidden = !options.length;
     });
@@ -265,12 +248,6 @@ NarrateControls.prototype = {
 
     this._doc.querySelector(".narrate-skip-previous").disabled = !speaking;
     this._doc.querySelector(".narrate-skip-next").disabled = !speaking;
-
-    if (speaking) {
-      TelemetryStopwatch.start("NARRATE_CONTENT_SPEAKTIME_MS", this);
-    } else {
-      TelemetryStopwatch.finish("NARRATE_CONTENT_SPEAKTIME_MS", this);
-    }
   },
 
   _createVoiceLabel(voice) {
-- 
cgit v1.2.3


From 6f64e487f35986f093dbb002d12554a61021b2c9 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Thu, 5 Jul 2018 21:00:31 -0400
Subject: Bug 1456652 - SameSite cookie Reader view patch bypass

---
 toolkit/components/reader/ReaderMode.jsm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index e9eb83154..6641e7387 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -119,7 +119,18 @@ this.ReaderMode = {
       }
     }
 
-    win.document.location = originalURL;
+    let referrerURI, principal;
+    try {
+      referrerURI = Services.io.newURI(url);
+      principal = Services.scriptSecurityManager.createCodebasePrincipal(
+        referrerURI, win.document.nodePrincipal.originAttributes);
+    } catch (e) {
+      Cu.reportError(e);
+      return;
+    }
+    let flags =  webNav.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL |
+      webNav.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
+    webNav.loadURI(originalURL, flags, referrerURI, null, null, principal);
   },
 
   /**
-- 
cgit v1.2.3


From 6a8ba478553625a31b47e726d04c608d955c6b93 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Sat, 7 Jul 2018 07:52:35 -0400
Subject: Revert "Bug 1456652 - SameSite cookie Reader view patch bypass"

This reverts commit 6f64e487f35986f093dbb002d12554a61021b2c9.
---
 toolkit/components/reader/ReaderMode.jsm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index 6641e7387..e9eb83154 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -119,18 +119,7 @@ this.ReaderMode = {
       }
     }
 
-    let referrerURI, principal;
-    try {
-      referrerURI = Services.io.newURI(url);
-      principal = Services.scriptSecurityManager.createCodebasePrincipal(
-        referrerURI, win.document.nodePrincipal.originAttributes);
-    } catch (e) {
-      Cu.reportError(e);
-      return;
-    }
-    let flags =  webNav.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL |
-      webNav.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
-    webNav.loadURI(originalURL, flags, referrerURI, null, null, principal);
+    win.document.location = originalURL;
   },
 
   /**
-- 
cgit v1.2.3