Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Centaury] Fix bug with disabple-gmp option.

master
Fedor 2021-01-17 16:11:26 +02:00 committed by Fedor
parent 54bec51574
commit 44efee31d3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/basilisk/base/content/browser.js
View File

@ -23,7 +23,9 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
["Deprecated", "resource://gre/modules/Deprecated.jsm"], ["Deprecated", "resource://gre/modules/Deprecated.jsm"],
["E10SUtils", "resource:///modules/E10SUtils.jsm"], ["E10SUtils", "resource:///modules/E10SUtils.jsm"],
["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"], ["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"],
#ifdef THE_GMP
["GMPInstallManager", "resource://gre/modules/GMPInstallManager.jsm"], ["GMPInstallManager", "resource://gre/modules/GMPInstallManager.jsm"],
#endif
["LightweightThemeManager", "resource://gre/modules/LightweightThemeManager.jsm"], ["LightweightThemeManager", "resource://gre/modules/LightweightThemeManager.jsm"],
["Log", "resource://gre/modules/Log.jsm"], ["Log", "resource://gre/modules/Log.jsm"],
["LoginManagerParent", "resource://gre/modules/LoginManagerParent.jsm"], ["LoginManagerParent", "resource://gre/modules/LoginManagerParent.jsm"],
@ -1338,7 +1340,7 @@ var gBrowserInit = {
} catch (ex) { } catch (ex) {
Cu.reportError("Could not end startup crash tracking: " + ex); Cu.reportError("Could not end startup crash tracking: " + ex);
} }
#ifdef THE_GMP
// Delay this a minute because there's no rush // Delay this a minute because there's no rush
setTimeout(() => { setTimeout(() => {
this.gmpInstallManager = new GMPInstallManager(); this.gmpInstallManager = new GMPInstallManager();
@ -1346,7 +1348,7 @@ var gBrowserInit = {
// can check the log. // can check the log.
this.gmpInstallManager.simpleCheckAndInstall().then(null, () => {}); this.gmpInstallManager.simpleCheckAndInstall().then(null, () => {});
}, 1000 * 60); }, 1000 * 60);
#endif
// Report via telemetry whether we're able to play MP4/H.264/AAC video. // Report via telemetry whether we're able to play MP4/H.264/AAC video.
// We suspect that some Windows users have a broken or have not installed // We suspect that some Windows users have a broken or have not installed
// Windows Media Foundation, and we'd like to know how many. We'd also like // Windows Media Foundation, and we'd like to know how many. We'd also like
@ -1514,11 +1516,11 @@ var gBrowserInit = {
} catch (ex) { } catch (ex) {
Cu.reportError(ex); Cu.reportError(ex);
} }
#ifdef THE_GMP
if (this.gmpInstallManager) { if (this.gmpInstallManager) {
this.gmpInstallManager.uninit(); this.gmpInstallManager.uninit();
} }
#endif
BrowserOffline.uninit(); BrowserOffline.uninit();
IndexedDBPromptHelper.uninit(); IndexedDBPromptHelper.uninit();
LightweightThemeListener.uninit(); LightweightThemeListener.uninit();

2
application/basilisk/modules/PluginContent.jsm
View File

@ -1118,7 +1118,6 @@ PluginContent.prototype = {
// TODO: Throw exception? How did we get here? // TODO: Throw exception? How did we get here?
return; return;
} }
#endif
let messageString = let messageString =
gNavigatorBundle.formatStringFromName("crashedpluginsMessage.title", gNavigatorBundle.formatStringFromName("crashedpluginsMessage.title",
@ -1132,4 +1131,5 @@ PluginContent.prototype = {
this.hideNotificationBar("plugin-crashed"); this.hideNotificationBar("plugin-crashed");
}, false); }, false);
}, },
#endif
}; };