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

Bug 1524688: Part 18 - Convert presentation data channel stuff to static registration. r=smaug

Browse Source 
--HG--
rename : dom/presentation/PresentationDataChannelSessionTransport.js => dom/presentation/PresentationDataChannelSessionTransport.jsm
extra : rebase_source : 514f69aa4ba4f74ccd7522e14e605a734c4f143a
This commit is contained in:
Kris Maglione 2019-01-29 20:56:00 -08:00
parent cfcfda0735
commit 943282a9a0
7 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/installer/package-manifest.in
View File

@ -283,8 +283,6 @@
@RESPATH@/components/BuiltinProviders.manifest
@RESPATH@/components/PresentationControlService.js
@RESPATH@/components/PresentationDataChannelSessionTransport.js
@RESPATH@/components/PresentationDataChannelSessionTransport.manifest
@RESPATH@/components/mozIntl.manifest
@RESPATH@/components/mozIntl.js

4
dom/presentation/PresentationDataChannelSessionTransport.js → dom/presentation/PresentationDataChannelSessionTransport.jsm
View File

@ -4,7 +4,6 @@
"use strict";
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Bug 1228209 - plan to remove this eventually
@ -372,5 +371,4 @@ PresentationTransport.prototype = {
},
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PresentationTransportBuilder,
PresentationTransport]);
var EXPORTED_SYMBOLS = ["PresentationTransportBuilder", "PresentationTransport"];

6
dom/presentation/PresentationDataChannelSessionTransport.manifest
View File

@ -1,6 +0,0 @@
# PresentationDataChannelSessionTransport.js
component {dd2bbf2f-3399-4389-8f5f-d382afb8b2d6} PresentationDataChannelSessionTransport.js
contract @mozilla.org/presentation/datachanneltransport;1 {dd2bbf2f-3399-4389-8f5f-d382afb8b2d6}
component {215b2f62-46e2-4004-a3d1-6858e56c20f3} PresentationDataChannelSessionTransport.js
contract @mozilla.org/presentation/datachanneltransportbuilder;1 {215b2f62-46e2-4004-a3d1-6858e56c20f3}

20
dom/presentation/components.conf Normal file
View File

@ -0,0 +1,20 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Classes = [
{
'cid': '{dd2bbf2f-3399-4389-8f5f-d382afb8b2d6}',
'contract_ids': ['@mozilla.org/presentation/datachanneltransport;1'],
'jsm': 'resource://gre/modules/PresentationDataChannelSessionTransport.jsm',
'constructor': 'PresentationTransport',
},
{
'cid': '{215b2f62-46e2-4004-a3d1-6858e56c20f3}',
'contract_ids': ['@mozilla.org/presentation/datachanneltransportbuilder;1'],
'jsm': 'resource://gre/modules/PresentationDataChannelSessionTransport.jsm',
'constructor': 'PresentationTransportBuilder',
},
]

9
dom/presentation/moz.build
View File

@ -60,9 +60,12 @@ UNIFIED_SOURCES += [
'PresentationTransportBuilderConstructor.cpp'
]
EXTRA_COMPONENTS += [
'PresentationDataChannelSessionTransport.js',
'PresentationDataChannelSessionTransport.manifest',
EXTRA_JS_MODULES += [
'PresentationDataChannelSessionTransport.jsm',
]
XPCOM_MANIFESTS += [
'components.conf',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':

5
dom/presentation/tests/mochitest/PresentationSessionFrameScript.js
View File

@ -185,9 +185,6 @@ function loadPrivilegedScriptTest() {
originalClassId = "";
originalFactory = null;
}
if (originalFactory) {
registrar.unregisterFactory(originalClassId, originalFactory);
}
registrar.registerFactory(mockedClassId, "", contractId, mockedFactory);
}
@ -202,7 +199,7 @@ function loadPrivilegedScriptTest() {
if (originalFactory) {
var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
registrar.unregisterFactory(mockedClassId, mockedFactory);
registrar.registerFactory(originalClassId, "", contractId, originalFactory);
registrar.registerFactory(originalClassId, "", contractId, null);
}
}

2
mobile/android/installer/package-manifest.in
View File

@ -195,8 +195,6 @@
@BINPATH@/components/PresentationControlService.js
@BINPATH@/components/PresentationNetworkHelper.js
@BINPATH@/components/PresentationNetworkHelper.manifest
@BINPATH@/components/PresentationDataChannelSessionTransport.js
@BINPATH@/components/PresentationDataChannelSessionTransport.manifest
@BINPATH@/components/AndroidCastDeviceProvider.manifest
@BINPATH@/components/AndroidCastDeviceProvider.js
#endif