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

Fix botched backout (bug 1524687). r=bustage

Browse Source 
--HG--
extra : rebase_source : 9dbfd1799f73097f30c8d32535b2ba9a2f6afd59
extra : amend_source : 7e8308ee4cc33864453a3781edd60a82c5ff6437
This commit is contained in:
Kris Maglione 2019-02-14 17:54:00 -08:00
parent 1e9aa9e1fc
commit 51aa53dc4e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/presentation/tests/xpcshell/test_multicast_dns_device_provider.js
View File

@ -100,7 +100,7 @@ ContractHook.prototype = {
this.unregister();
let prevContract = this.hookedMap.get(this._contractID).pop();
if (prevContract.factory) {
if (prevContract.classID) {
registrar.registerFactory(prevContract.classID,
"",
this._contractID,
@ -120,7 +120,11 @@ ContractHook.prototype = {
}
if (factory) {
registrar.unregisterFactory(classID, factory);
try {
registrar.unregisterFactory(classID, factory);
} catch (e) {
factory = null;
}
}
return { classID, factory };

4
netwerk/dns/mdns/libmdns/moz.build
View File

@ -27,10 +27,6 @@ else:
'fallback/MulticastDNS.jsm',
]
XPCOM_MANIFESTS += [
'components.conf',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
EXTRA_JS_MODULES += [
'MulticastDNSAndroid.jsm',