From e6bd2d9cb2d75fa7f714ae89e9ab33598f35a385 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 29 Sep 2017 03:16:10 -0700
Subject: [PATCH] Use page XHR for Firefox WE, and list host permissions
 explicitly.

---
 src/meta/jshint.json   |  1 +
 src/meta/manifest.json |  4 +---
 src/platform/$.coffee  | 10 +++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/meta/jshint.json b/src/meta/jshint.json
index 45f62a3eb..1b58dc59c 100644
--- a/src/meta/jshint.json
+++ b/src/meta/jshint.json
@@ -20,6 +20,7 @@
     "BroadcastChannel": false,
     "GM_info":      false,
     "cloneInto":    false,
+    "XPCNativeWrapper": false,
     "unsafeWindow": false,
     "chrome":       false,
     "GM":           false<%=
diff --git a/src/meta/manifest.json b/src/meta/manifest.json
index 5ae8a594c..dec9c0068 100644
--- a/src/meta/manifest.json
+++ b/src/meta/manifest.json
@@ -23,9 +23,7 @@
 <% if (channel !== '-noupdate') { %>  "update_url": "<%= meta.downloads %>updates<%= channel %>.xml",
   "key": "<%= meta.appid %>",
 <% } %>  "minimum_chrome_version": "<%= meta.min.chrome %>",
-  "permissions": [
-    "storage"
-  ],
+  "permissions": <%= JSON.stringify(meta.matches_only.concat(["storage"])) %>,
   "optional_permissions": [
     "*://*/"
   ],
diff --git a/src/platform/$.coffee b/src/platform/$.coffee
index abc9c3c65..a989a8fda 100644
--- a/src/platform/$.coffee
+++ b/src/platform/$.coffee
@@ -45,6 +45,10 @@ $.ajax = do ->
   # With the `If-Modified-Since` header we only receive the HTTP headers and no body for 304 responses.
   # This saves a lot of bandwidth and CPU time for both the users and the servers.
   lastModified = {}
+  <% if (type === 'crx') { %>
+  if XPCNativeWrapper?
+    pageXHR = XPCNativeWrapper window.wrappedJSObject.XMLHttpRequest
+  <% } %>
 
   (url, options={}, extra={}) ->
     {type, whenModified, upCallbacks, form} = extra
@@ -53,7 +57,11 @@ $.ajax = do ->
     url = url.replace /^((?:https?:)?\/\/(?:\w+\.)?4c(?:ha|d)n\.org)\/adv\//, '$1//adv/'
     # XXX https://bugs.chromium.org/p/chromium/issues/detail?id=643659
     url += "?s=#{whenModified}" if $.engine is 'blink' and whenModified
-    r = new XMLHttpRequest()
+    xhr = XMLHttpRequest
+    <% if (type === 'crx') { %>
+    xhr = pageXHR or xhr
+    <% } %>
+    r = new xhr()
     type or= form and 'post' or 'get'
     try
       r.open type, url, true