Merge pull request #9511 from Snuffleupagus/more-upstreaming
Upstream changes from bug 792808 and 1440284
This commit is contained in:
commit
97faedba0c
@ -15,9 +15,9 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
this.EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
|
||||
var EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
|
||||
|
||||
this.PdfJsTelemetry = {
|
||||
var PdfJsTelemetry = {
|
||||
onViewerIsUsed() {
|
||||
},
|
||||
onFallback() {
|
||||
|
@ -16,11 +16,11 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
this.EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
|
||||
var EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
|
||||
|
||||
ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
this.PdfJsTelemetry = {
|
||||
var PdfJsTelemetry = {
|
||||
onViewerIsUsed() {
|
||||
let histogram = Services.telemetry.getHistogramById("PDF_VIEWER_USED");
|
||||
histogram.add(true);
|
||||
|
@ -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;
|
||||
|
@ -9,9 +9,9 @@
|
||||
"babel-preset-env": "^1.6.1",
|
||||
"core-js": "^2.5.3",
|
||||
"escodegen": "^1.9.0",
|
||||
"eslint": "^4.17.0",
|
||||
"eslint-plugin-mozilla": "^0.8.1",
|
||||
"eslint-plugin-no-unsanitized": "^2.0.2",
|
||||
"eslint": "^4.18.1",
|
||||
"eslint-plugin-mozilla": "^0.9.0",
|
||||
"eslint-plugin-no-unsanitized": "^3.0.0",
|
||||
"fancy-log": "^1.3.2",
|
||||
"gulp": "^3.9.1",
|
||||
"gulp-rename": "^1.2.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user