Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1039226 - Trigger explicit OpenH264 updates from OpenH264Provider. r=unfocused

Browse Source
This commit is contained in:
Georg Fritzsche 2014-07-23 16:00:55 +02:00
parent 419887d283
commit c360378185
2 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
View File

@ -16,6 +16,11 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Preferences.jsm");
Cu.import("resource://gre/modules/osfile.jsm");
Cu.import("resource://gre/modules/Log.jsm");
Cu.import("resource://gre/modules/Task.jsm");
//Cu.import("resource://gre/modules/GMPInstallManager.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "GMPInstallManager",
"resource://gre/modules/GMPInstallManager.jsm");
const URI_EXTENSION_STRINGS = "chrome://mozapps/locale/extensions/extensions.properties";
const STRING_TYPE_NAME = "type.%ID%.name";
@ -69,7 +74,12 @@ function configureLogging() {
* The OpenH264Wrapper provides the info for the OpenH264 GMP plugin to public callers through the API.
*/
let OpenH264Wrapper = Object.freeze({
let OpenH264Wrapper = {
// An active task that checks for OpenH264 updates and installs them.
_updateTask: null,
_log: null,
optionsType: AddonManager.OPTIONS_TYPE_INLINE,
optionsURL: OPENH264_OPTIONS_URL,
@ -158,14 +168,32 @@ let OpenH264Wrapper = Object.freeze({
},
findUpdates: function(aListener, aReason, aAppVersion, aPlatformVersion) {
// TODO: Hook up to openh264 update for AddonManager.UPDATE_WHEN_USER_REQUESTED (pending bug 1035225)
this._log.trace("findUpdates() - reason=" + aReason);
if ("onNoCompatibilityUpdateAvailable" in aListener)
aListener.onNoCompatibilityUpdateAvailable(this);
if ("onNoUpdateAvailable" in aListener)
aListener.onNoUpdateAvailable(this);
if ("onUpdateFinished" in aListener)
aListener.onUpdateFinished(this);
AddonManagerPrivate.callNoUpdateListeners(this, aListener);
if (aReason !== AddonManager.UPDATE_WHEN_USER_REQUESTED ||
this._updateTask !== null) {
return;
}
this._updateTask = Task.spawn(function* OpenH264Provider_updateTask() {
this._log.trace("findUpdates() - updateTask");
try {
let installManager = new GMPInstallManager();
let addons = yield installManager.checkForAddons();
let openH264 = addons.find(addon => addon.isOpenH264);
if (openH264 && !openH264.isInstalled) {
yield installManager.installAddon(openH264);
}
this._log.info("findUpdates() - updateTask succeeded");
} catch (e) {
this._log.error("findUpdates() - updateTask threw: " + e);
throw e;
} finally {
this._updateTask = null;
}
}.bind(this));
},
get pluginMimeTypes() { return []; },
@ -182,12 +210,15 @@ let OpenH264Wrapper = Object.freeze({
let path = prefs.get(OPENH264_PREF_PATH, "");
return path.length > 0;
},
});
};
let OpenH264Provider = {
startup: function() {
configureLogging();
this._log = Log.repository.getLogger("Toolkit.OpenH264Provider");
this._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.OpenH264Provider",
"OpenH264Provider" + "::");
OpenH264Wrapper._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.OpenH264Provider",
"OpenH264Wrapper" + "::");
this.gmpPath = prefs.get(OPENH264_PREF_PATH, null);
let enabled = prefs.get(OPENH264_PREF_ENABLED, true);
this._log.trace("startup() - enabled=" + enabled + ", gmpPath="+this.gmpPath);
@ -210,6 +241,8 @@ let OpenH264Provider = {
prefs.ignore(OPENH264_PREF_ENABLED, this.onPrefEnabledChanged, this);
prefs.ignore(OPENH264_PREF_PATH, this.onPrefPathChanged, this);
prefs.ignore(OPENH264_PREF_LOGGING, configureLogging);
return OpenH264Wrapper._updateTask;
},
onPrefEnabledChanged: function() {

51
toolkit/mozapps/extensions/test/browser/browser_openH264.js
View File

@ -2,7 +2,11 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
let {AddonTestUtils} = Components.utils.import("resource://testing-common/AddonManagerTesting.jsm", {});
"use strict";
Cu.import("resource://gre/modules/Promise.jsm");
let {AddonTestUtils} = Cu.import("resource://testing-common/AddonManagerTesting.jsm", {});
let OpenH264Scope = Cu.import("resource://gre/modules/addons/OpenH264Provider.jsm");
const OPENH264_PLUGIN_ID = "gmp-gmpopenh264";
const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + ".";
@ -21,6 +25,29 @@ let gManagerWindow;
let gCategoryUtilities;
let gIsEnUsLocale;
let MockGMPAddon = Object.freeze({
id: OPENH264_PLUGIN_ID,
isOpenH264: true,
isInstalled: false,
});
let gInstalledAddonId = "";
let gInstallDeferred = null;
function MockGMPInstallManager() {
}
MockGMPInstallManager.prototype = {
checkForAddons: () => Promise.resolve([MockGMPAddon]),
installAddon: addon => {
gInstalledAddonId = addon.id;
gInstallDeferred.resolve();
return Promise.resolve();
},
};
let gOptionsObserver = {
lastDisplayed: null,
observe: function(aSubject, aTopic, aData) {
@ -202,6 +229,28 @@ add_task(function* testPreferencesButton() {
}
});
add_task(function* testUpdateButton() {
yield gCategoryUtilities.openType("plugin");
let doc = gManagerWindow.document;
let item = get_addon_element(gManagerWindow, OPENH264_PLUGIN_ID);
Object.defineProperty(OpenH264Scope, "GMPInstallManager", {
value: MockGMPInstallManager,
writable: true,
enumerable: true,
configurable: true
});
gInstalledAddonId = "";
gInstallDeferred = Promise.defer();
let button = doc.getElementById("detail-findUpdates-btn");
Assert.ok(button != null, "Got detail-findUpdates-btn");
button.click();
yield gInstallDeferred.promise;
Assert.equal(gInstalledAddonId, OPENH264_PLUGIN_ID);
});
add_task(function* test_cleanup() {
yield close_manager(gManagerWindow);
});