From adfc3babc913c1a97dfd3e0234e7a6f5db3ede66 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 7 Jan 2017 04:10:18 -0800
Subject: [PATCH] Revert Data Saver workarounds. They didn't work. #1241

Revert "Fix bug from 4f9f1941be2aea72b4d8145a62d9835087fbfc39. #1241"

This reverts commit 9e3d33ffd488ef63af1340eeacb146c698a0a7b9.

Revert "Workaround for Chrome Compression Proxy converting images to WebP. #1241"

This reverts commit 4f9f1941be2aea72b4d8145a62d9835087fbfc39.
---
 src/Posting/QR.coffee           |  1 -
 src/Posting/QR.oekaki.coffee    |  1 -
 src/meta/eventPage.coffee       |  1 -
 src/platform/CrossOrigin.coffee | 11 +++++------
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 871cf2a7d..22f0c177e 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -407,7 +407,6 @@ QR =
         QR.handleFiles [blob]
       else
         QR.error "Can't load file."
-    , Accept: Object.keys(QR.extensionFromType).join(',')
 
   handleFiles: (files) ->
     if @ isnt QR # file input
diff --git a/src/Posting/QR.oekaki.coffee b/src/Posting/QR.oekaki.coffee
index 0721f6c30..f1daaf97d 100644
--- a/src/Posting/QR.oekaki.coffee
+++ b/src/Posting/QR.oekaki.coffee
@@ -43,7 +43,6 @@ QR.oekaki =
           blob.name = post.file.name
           QR.handleFiles [blob]
           QR.oekaki.edit()
-      , Accept: Object.keys(QR.extensionFromType).join(',')
 
   setup: ->
     $.global ->
diff --git a/src/meta/eventPage.coffee b/src/meta/eventPage.coffee
index 06c056ac8..de87915e4 100644
--- a/src/meta/eventPage.coffee
+++ b/src/meta/eventPage.coffee
@@ -25,7 +25,6 @@ ajax = (request, sender, sendResponse) ->
 
   xhr = new XMLHttpRequest()
   xhr.open 'GET', request.url, true
-  xhr.setRequestHeader key, value for key, value of request.headers
   xhr.responseType = request.responseType
   xhr.addEventListener 'load', ->
     if @readyState is @DONE && xhr.status is 200
diff --git a/src/platform/CrossOrigin.coffee b/src/platform/CrossOrigin.coffee
index 8a3f01925..fdfa1cf65 100644
--- a/src/platform/CrossOrigin.coffee
+++ b/src/platform/CrossOrigin.coffee
@@ -4,8 +4,8 @@ eventPageRequest = do ->
   chrome.runtime.onMessage.addListener (data) ->
     callbacks[data.id] data
     delete callbacks[data.id]
-  (url, headers, responseType, cb) ->
-    chrome.runtime.sendMessage {url, headers, responseType}, (id) ->
+  (url, responseType, cb) ->
+    chrome.runtime.sendMessage {url, responseType}, (id) ->
       callbacks[id] = cb
 
 <% } %>
@@ -29,7 +29,7 @@ CrossOrigin =
         cb null
       xhr.send()
     else
-      eventPageRequest url, headers, 'arraybuffer', ({response, contentType, contentDisposition, error}) ->
+      eventPageRequest url, 'arraybuffer', ({response, contentType, contentDisposition, error}) ->
         return cb null if error
         cb new Uint8Array(response), contentType, contentDisposition
     <% } %>
@@ -66,7 +66,7 @@ CrossOrigin =
     GM_xmlhttpRequest options
     <% } %>
 
-  file: (url, cb, headers={}) ->
+  file: (url, cb) ->
     CrossOrigin.binary url, (data, contentType, contentDisposition) ->
       return cb null unless data?
       name = url.match(/([^\/]+)\/*$/)?[1]
@@ -82,7 +82,6 @@ CrossOrigin =
       blob = new Blob([data], {type: mime})
       blob.name = name
       cb blob
-    , headers
 
   json: do ->
     callbacks = {}
@@ -114,7 +113,7 @@ CrossOrigin =
           delete callbacks[url]
       <% } %>
       <% if (type === 'crx') { %>
-      eventPageRequest url, {}, 'json', ({response, error}) ->
+      eventPageRequest url, 'json', ({response, error}) ->
         if error
           delete callbacks[url]
         else