From 68077f61f1327de795e09c0742d59dffb1fb2618 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Mon, 26 Feb 2018 17:32:17 +0100
Subject: [PATCH] Upstream the changes from: Bug 792808 - Change
 PdfStreamConverter.jsm to import and instantiate XHRs from global properties
 rather than using Cc.createInstance(Ci.nsIXMLHttpRequest); r=mossop

Please see:
https://bugzilla.mozilla.org/show_bug.cgi?id=792808
https://hg.mozilla.org/mozilla-central/rev/56f9de9da69a

Fixes 9499.
---
 extensions/firefox/content/PdfStreamConverter.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/firefox/content/PdfStreamConverter.jsm b/extensions/firefox/content/PdfStreamConverter.jsm
index a546dfb9c..613553c48 100644
--- a/extensions/firefox/content/PdfStreamConverter.jsm
+++ b/extensions/firefox/content/PdfStreamConverter.jsm
@@ -41,6 +41,8 @@ ChromeUtils.defineModuleGetter(this, "PdfJsTelemetry",
 ChromeUtils.defineModuleGetter(this, "PdfjsContentUtils",
   "resource://pdf.js/PdfjsContentUtils.jsm");
 
+Cu.importGlobalProperties(["XMLHttpRequest"]);
+
 var Svc = {};
 XPCOMUtils.defineLazyServiceGetter(Svc, "mime",
                                    "@mozilla.org/mime;1",
@@ -593,8 +595,6 @@ class RangedChromeActions extends ChromeActions {
       }
     };
     var getXhr = function getXhr() {
-      const XMLHttpRequest = Components.Constructor(
-          "@mozilla.org/xmlextras/xmlhttprequest;1");
       var xhr = new XMLHttpRequest();
       xhr.addEventListener("readystatechange", xhr_onreadystatechange);
       return xhr;