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

Merge pull request #3366 from vdjeric/master

Browse Source 
Avoid triggering plugin list initialization on startup (Bugzilla 881575)
This commit is contained in:
Brendan Dahl 2013-06-18 11:00:09 -07:00
commit dd2b874744
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,18 @@ let PdfJs = {
return false; return false;
} }
// we also need to check if pdf plugin is not present or disabled... // Check if we have disabled plugin handling of 'application/pdf' in prefs
if (Services.prefs.prefHasUserValue(PREF_DISABLED_PLUGIN_TYPES)) {
let disabledPluginTypes =
Services.prefs.getCharPref(PREF_DISABLED_PLUGIN_TYPES).split(',');
if (disabledPluginTypes.indexOf(PDF_CONTENT_TYPE) >= 0) {
return true;
}
}
// Check if there is an enabled pdf plugin.
// Note: this check is performed last because getPluginTags() triggers costly
// plugin list initialization (bug 881575)
let tags = Cc["@mozilla.org/plugin/host;1"]. let tags = Cc["@mozilla.org/plugin/host;1"].
getService(Ci.nsIPluginHost). getService(Ci.nsIPluginHost).
getPluginTags(); getPluginTags();
@ -216,14 +227,9 @@ let PdfJs = {
return mimeType.type === PDF_CONTENT_TYPE; return mimeType.type === PDF_CONTENT_TYPE;
}); });
}); });
if (!enabledPluginFound) {
return true; // no plugins for this type, it's good // Use pdf.js if pdf plugin is not present or disabled
} return !enabledPluginFound;
// ... and full page plugins list must have 'application/pdf' type,
// in case when enabled pdf plugin exists.
return Services.prefs.prefHasUserValue(PREF_DISABLED_PLUGIN_TYPES) ?
(Services.prefs.getCharPref(PREF_DISABLED_PLUGIN_TYPES).split(',').
indexOf(PDF_CONTENT_TYPE) >= 0) : false;
}, },
_ensureRegistered: function _ensureRegistered() { _ensureRegistered: function _ensureRegistered() {