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

Merge pull request #5317 from yurydelendik/e10s-rev

Browse Source 
Bug 1064496 review changes
This commit is contained in:
Yury Delendik 2014-09-19 15:34:54 -05:00
commit 9855fa39d7
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/firefox/content/PdfJs.jsm
View File

@ -42,8 +42,6 @@ XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
XPCOMUtils.defineLazyServiceGetter(Svc, 'pluginHost', XPCOMUtils.defineLazyServiceGetter(Svc, 'pluginHost',
'@mozilla.org/plugin/host;1', '@mozilla.org/plugin/host;1',
'nsIPluginHost'); 'nsIPluginHost');
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PdfjsChromeUtils", XPCOMUtils.defineLazyModuleGetter(this, "PdfjsChromeUtils",
"resource://pdf.js/PdfjsChromeUtils.jsm"); "resource://pdf.js/PdfjsChromeUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PdfjsContentUtils", XPCOMUtils.defineLazyModuleGetter(this, "PdfjsContentUtils",

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

@ -51,9 +51,6 @@ XPCOMUtils.defineLazyModuleGetter(this, 'PdfJsTelemetry',
XPCOMUtils.defineLazyModuleGetter(this, 'PdfjsContentUtils', XPCOMUtils.defineLazyModuleGetter(this, 'PdfjsContentUtils',
'resource://pdf.js/PdfjsContentUtils.jsm'); 'resource://pdf.js/PdfjsContentUtils.jsm');
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
'resource://gre/modules/BrowserUtils.jsm');
var Svc = {}; var Svc = {};
XPCOMUtils.defineLazyServiceGetter(Svc, 'mime', XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
'@mozilla.org/mime;1', '@mozilla.org/mime;1',

15
extensions/firefox/content/PdfjsChromeUtils.jsm
View File

@ -31,9 +31,6 @@ 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');
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
let Svc = {}; let Svc = {};
XPCOMUtils.defineLazyServiceGetter(Svc, 'mime', XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
'@mozilla.org/mime;1', '@mozilla.org/mime;1',
@ -125,19 +122,19 @@ let PdfjsChromeUtils = {
receiveMessage: function (aMsg) { receiveMessage: function (aMsg) {
switch (aMsg.name) { switch (aMsg.name) {
case "PDFJS:Parent:clearUserPref": case "PDFJS:Parent:clearUserPref":
this._clearUserPref(aMsg.json.name); this._clearUserPref(aMsg.data.name);
break; break;
case "PDFJS:Parent:setIntPref": case "PDFJS:Parent:setIntPref":
this._setIntPref(aMsg.json.name, aMsg.json.value); this._setIntPref(aMsg.data.name, aMsg.data.value);
break; break;
case "PDFJS:Parent:setBoolPref": case "PDFJS:Parent:setBoolPref":
this._setBoolPref(aMsg.json.name, aMsg.json.value); this._setBoolPref(aMsg.data.name, aMsg.data.value);
break; break;
case "PDFJS:Parent:setCharPref": case "PDFJS:Parent:setCharPref":
this._setCharPref(aMsg.json.name, aMsg.json.value); this._setCharPref(aMsg.data.name, aMsg.data.value);
break; break;
case "PDFJS:Parent:setStringPref": case "PDFJS:Parent:setStringPref":
this._setStringPref(aMsg.json.name, aMsg.json.value); this._setStringPref(aMsg.data.name, aMsg.data.value);
break; break;
case "PDFJS:Parent:isDefaultHandlerApp": case "PDFJS:Parent:isDefaultHandlerApp":
return this.isDefaultHandlerApp(); return this.isDefaultHandlerApp();
@ -231,7 +228,7 @@ let PdfjsChromeUtils = {
* a pdf displayed correctly. * a pdf displayed correctly.
*/ */
_displayWarning: function (aMsg) { _displayWarning: function (aMsg) {
let json = aMsg.json; let json = aMsg.data;
let browser = aMsg.target; let browser = aMsg.target;
let cpowCallback = aMsg.objects.callback; let cpowCallback = aMsg.objects.callback;
let tabbrowser = browser.getTabBrowser(); let tabbrowser = browser.getTabBrowser();

5
extensions/firefox/content/PdfjsContentUtils.jsm
View File

@ -25,9 +25,6 @@ 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');
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
let PdfjsContentUtils = { let PdfjsContentUtils = {
_mm: null, _mm: null,
@ -113,8 +110,6 @@ let PdfjsContentUtils = {
// the child's dom frame mm associated with the window. // the child's dom frame mm associated with the window.
let winmm = aWindow.QueryInterface(Ci.nsIInterfaceRequestor) let winmm = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDocShell) .getInterface(Ci.nsIDocShell)
.sameTypeRootTreeItem
.QueryInterface(Ci.nsIDocShell)
.QueryInterface(Ci.nsIInterfaceRequestor) .QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager); .getInterface(Ci.nsIContentFrameMessageManager);
winmm.sendAsyncMessage("PDFJS:Parent:displayWarning", { winmm.sendAsyncMessage("PDFJS:Parent:displayWarning", {