Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9511 from Snuffleupagus/more-upstreaming

Browse Source 
Upstream changes from bug 792808 and 1440284
This commit is contained in:
Brendan Dahl 2018-02-26 13:09:15 -08:00 committed by GitHub
commit 97faedba0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/firefox/content/PdfJsTelemetry-stub.jsm
View File

@ -15,9 +15,9 @@
"use strict"; "use strict";
this.EXPORTED_SYMBOLS = ["PdfJsTelemetry"]; var EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
this.PdfJsTelemetry = { var PdfJsTelemetry = {
onViewerIsUsed() { onViewerIsUsed() {
}, },
onFallback() { onFallback() {

4
extensions/firefox/content/PdfJsTelemetry.jsm
View File

@ -16,11 +16,11 @@
"use strict"; "use strict";
this.EXPORTED_SYMBOLS = ["PdfJsTelemetry"]; var EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/Services.jsm");
this.PdfJsTelemetry = { var PdfJsTelemetry = {
onViewerIsUsed() { onViewerIsUsed() {
let histogram = Services.telemetry.getHistogramById("PDF_VIEWER_USED"); let histogram = Services.telemetry.getHistogramById("PDF_VIEWER_USED");
histogram.add(true); histogram.add(true);

4
extensions/firefox/content/PdfStreamConverter.jsm
View File

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

6
package.json
View File

@ -9,9 +9,9 @@
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
"core-js": "^2.5.3", "core-js": "^2.5.3",
"escodegen": "^1.9.0", "escodegen": "^1.9.0",
"eslint": "^4.17.0", "eslint": "^4.18.1",
"eslint-plugin-mozilla": "^0.8.1", "eslint-plugin-mozilla": "^0.9.0",
"eslint-plugin-no-unsanitized": "^2.0.2", "eslint-plugin-no-unsanitized": "^3.0.0",
"fancy-log": "^1.3.2", "fancy-log": "^1.3.2",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",