Merge pull request #6489 from Snuffleupagus/bug-1202902

Upstream changes from Bug 1202902 - Give loader scripts and XUL frame scripts a lexical scope that doesn't break everything?
This commit is contained in:
Yury Delendik 2015-10-01 11:44:28 -05:00
commit 09c1fc51f1
4 changed files with 5 additions and 5 deletions

View File

@ -22,6 +22,6 @@
// See https://mxr.mozilla.org/mozilla-central/source/browser/components/nsBrowserGlue.js // See https://mxr.mozilla.org/mozilla-central/source/browser/components/nsBrowserGlue.js
var EXPORTED_SYMBOLS = ['PdfJs']; var EXPORTED_SYMBOLS = ['PdfJs'];
let PdfJs = { var PdfJs = {
init: function PdfJs_init() {} init: function PdfJs_init() {}
}; };

View File

@ -43,7 +43,7 @@ const PDF_CONTENT_TYPE = 'application/pdf';
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
let Svc = {}; var Svc = {};
XPCOMUtils.defineLazyServiceGetter(Svc, 'mime', XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
'@mozilla.org/mime;1', '@mozilla.org/mime;1',
'nsIMIMEService'); 'nsIMIMEService');
@ -130,7 +130,7 @@ Factory.prototype = {
} }
}; };
let PdfJs = { var PdfJs = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]), QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
_registered: false, _registered: false,
_initialized: false, _initialized: false,

View File

@ -32,7 +32,7 @@ const PDF_CONTENT_TYPE = 'application/pdf';
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
let Svc = {}; var Svc = {};
XPCOMUtils.defineLazyServiceGetter(Svc, 'mime', XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
'@mozilla.org/mime;1', '@mozilla.org/mime;1',
'nsIMIMEService'); 'nsIMIMEService');

View File

@ -29,7 +29,7 @@ const Cu = Components.utils;
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
let PdfjsContentUtils = { var PdfjsContentUtils = {
_mm: null, _mm: null,
/* /*