mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-c to inbound. a=merge 

--HG--
rename : dom/tv/test/file_app.sjs => dom/tv/test/mochitest/file_app.sjs
rename : dom/tv/test/file_app.template.webapp => dom/tv/test/mochitest/file_app.template.webapp
rename : dom/tv/test/file_tv_non_permitted_app.html => dom/tv/test/mochitest/file_tv_non_permitted_app.html
rename : dom/tv/test/mochitest.ini => dom/tv/test/mochitest/mochitest.ini
rename : dom/tv/test/test_tv_non_permitted_app.html => dom/tv/test/mochitest/test_tv_non_permitted_app.html
extra : rebase_source : 43e1262bc9912ae6b97ec9302a1bc149e51c8e1e
This commit is contained in:
Ryan VanderMeulen 2014-10-30 16:19:07 -04:00
Родитель bad15624f2 9a87c4aa6f
Коммит 618a8fabc6
137 изменённых файлов: 3511 добавлений и 516 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
b2g/app/b2g.js
Просмотреть файл

@ -982,8 +982,13 @@ pref("apz.asyncscroll.throttle", 40);
pref("apz.pan_repaint_interval", 16);
// APZ physics settings, tuned by UX designers
pref("apz.max_velocity_inches_per_ms", "0.07");
pref("apz.fling_curve_function_x1", "0.0");
pref("apz.fling_curve_function_y1", "0.0");
pref("apz.fling_curve_function_x2", "0.58");
pref("apz.fling_curve_function_y2", "1.0");
pref("apz.fling_curve_threshold_inches_per_ms", "0.03");
pref("apz.fling_friction", "0.003");
pref("apz.max_velocity_inches_per_ms", "0.07");
// Tweak default displayport values to reduce the risk of running out of
// memory when zooming in

2
b2g/config/dolphin/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/emulator-ics/sources.xml
Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>

2
b2g/config/emulator-jb/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="28be739bcdcbc9eb91c0bdbff1f7d3eab717969b"/>

2
b2g/config/emulator-kk/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/emulator/sources.xml
Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>

4
b2g/config/flame-kk/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
@ -126,6 +126,8 @@
<remove-project name="platform/frameworks/native"/>
<remove-project name="platform/hardware/libhardware"/>
<remove-project name="platform/external/bluetooth/bluedroid"/>
<remove-project name="platform/system/media"/>
<project name="platform/system/media" path="system/media" revision="c1332c21c608f4932a6d7e83450411cde53315ef"/>
<!--original fetch url was git://github.com/t2m-foxfone/-->
<remote fetch="https://git.mozilla.org/external/t2m-foxfone" name="t2m"/>
<default remote="caf" revision="LNX.LA.3.5.2.1.1" sync-j="4"/>

2
b2g/config/flame/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="28be739bcdcbc9eb91c0bdbff1f7d3eab717969b"/>

2
b2g/config/gaia.json
Просмотреть файл

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "4763231f664a8a94cbea98b35b84749b51a961c9",
"revision": "5b7182e0e489747ff07ca952f5a99dc21a0226c9",
"repo_path": "/integration/gaia-central"
}

2
b2g/config/hamachi/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/helix/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/nexus-4/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="28be739bcdcbc9eb91c0bdbff1f7d3eab717969b"/>

2
b2g/config/wasabi/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cddf7f505c4c280bacb74c22af3fa4959ccb555a"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="8ae6598f3ab7b0c34ac42a73083ddb74266affba"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

4
browser/base/content/test/general/browser.ini
Просмотреть файл

@ -314,9 +314,9 @@ skip-if = e10s
run-if = datareporting
[browser_devedition.js]
[browser_devices_get_user_media.js]
skip-if = buildapp == 'mulet' || os == "linux" || e10s # linux: bug 976544 & bug 1060315; e10s: Bug 973001 - appears user media notifications only happen in the child and don't make their way to the parent?
skip-if = buildapp == 'mulet' || (os == "linux" && debug) || e10s # linux: bug 976544; e10s: bug 1071623
[browser_devices_get_user_media_about_urls.js]
skip-if = e10s # Bug 973001 - appears user media notifications only happen in the child and don't make their way to the parent?
skip-if = e10s # Bug 1071623
[browser_discovery.js]
skip-if = e10s # Bug 918663 - DOMLinkAdded events don't make their way to chrome
[browser_double_close_tab.js]

18
browser/base/content/test/general/browser_devices_get_user_media.js
Просмотреть файл

@ -178,7 +178,7 @@ function getMediaCaptureState() {
return "none";
}
function closeStream(aAlreadyClosed) {
function* closeStream(aAlreadyClosed) {
expectNoObserverCalled();
info("closing the stream");
@ -191,7 +191,7 @@ function closeStream(aAlreadyClosed) {
if (!aAlreadyClosed)
expectObserverCalled("recording-window-ended");
assertWebRTCIndicatorStatus(null);
yield* assertWebRTCIndicatorStatus(null);
}
function checkDeviceSelectors(aAudio, aVideo) {
@ -208,19 +208,19 @@ function checkDeviceSelectors(aAudio, aVideo) {
ok(cameraSelector.hidden, "camera selector hidden");
}
function checkSharingUI(aExpected) {
function* checkSharingUI(aExpected) {
yield promisePopupNotification("webRTC-sharingDevices");
assertWebRTCIndicatorStatus(aExpected);
yield* assertWebRTCIndicatorStatus(aExpected);
}
function checkNotSharing() {
function* checkNotSharing() {
is(getMediaCaptureState(), "none", "expected nothing to be shared");
ok(!PopupNotifications.getNotification("webRTC-sharingDevices"),
"no webRTC-sharingDevices popup notification");
assertWebRTCIndicatorStatus(null);
yield* assertWebRTCIndicatorStatus(null);
}
const permissionError = "error: PermissionDeniedError: The user did not grant permission for the operation.";
@ -393,7 +393,7 @@ let gTests = [
expectObserverCalled("getUserMedia:response:deny");
expectObserverCalled("recording-window-ended");
checkNotSharing();
yield checkNotSharing();
}
},
@ -413,7 +413,7 @@ let gTests = [
expectObserverCalled("getUserMedia:response:deny");
expectObserverCalled("recording-window-ended");
checkNotSharing();
yield checkNotSharing();
}
},
@ -452,7 +452,7 @@ let gTests = [
}
expectNoObserverCalled();
checkNotSharing();
yield checkNotSharing();
// the stream is already closed, but this will do some cleanup anyway
yield closeStream(true);

4
browser/base/content/test/general/browser_devices_get_user_media_about_urls.js
Просмотреть файл

@ -110,7 +110,7 @@ function getMediaCaptureState() {
return "none";
}
function closeStream(aAlreadyClosed) {
function* closeStream(aAlreadyClosed) {
expectNoObserverCalled();
info("closing the stream");
@ -123,7 +123,7 @@ function closeStream(aAlreadyClosed) {
if (!aAlreadyClosed)
expectObserverCalled("recording-window-ended");
assertWebRTCIndicatorStatus(null);
yield* assertWebRTCIndicatorStatus(null);
}
function loadPage(aUrl) {

17
browser/base/content/test/general/head.js
Просмотреть файл

@ -667,7 +667,22 @@ function assertWebRTCIndicatorStatus(expected) {
let hasWindow = indicator.hasMoreElements();
is(hasWindow, !!expected, "popup " + msg);
if (hasWindow) {
let docElt = indicator.getNext().document.documentElement;
let document = indicator.getNext().document;
let docElt = document.documentElement;
if (document.readyState != "complete") {
info("Waiting for the sharing indicator's document to load");
let deferred = Promise.defer();
document.addEventListener("readystatechange",
function onReadyStateChange() {
if (document.readyState != "complete")
return;
document.removeEventListener("readystatechange", onReadyStateChange);
deferred.resolve();
});
yield deferred.promise;
}
for (let item of ["video", "audio", "screen"]) {
let expectedValue = (expected && expected[item]) ? "true" : "";
is(docElt.getAttribute("sharing" + item), expectedValue,

6
browser/components/customizableui/test/browser.ini
Просмотреть файл

@ -69,9 +69,9 @@ skip-if = os == "linux"
[browser_947914_button_addons.js]
skip-if = os == "linux" # Intermittent failures
[browser_947914_button_copy.js]
skip-if = os == "linux" # Intermittent failures
skip-if = os == "linux" || e10s # Intermittent failures on Linux, e10s issues are bug 1091561
[browser_947914_button_cut.js]
skip-if = os == "linux" # Intermittent failures
skip-if = os == "linux" || e10s # Intermittent failures on Linux, e10s issues are bug 1091561
[browser_947914_button_find.js]
skip-if = os == "linux" # Intermittent failures
[browser_947914_button_history.js]
@ -81,7 +81,7 @@ skip-if = os == "linux" # Intermittent failures
[browser_947914_button_newWindow.js]
skip-if = os == "linux" # Intermittent failures
[browser_947914_button_paste.js]
skip-if = os == "linux" # Intermittent failures
skip-if = os == "linux" || e10s # Intermittent failures on Linux, e10s issues are bug 1091561
[browser_947914_button_print.js]
skip-if = os == "linux" || (os == "win" && e10s) # Intermittent failures on Linux, e10s issues on Windows (bug 1088714)
[browser_947914_button_savePage.js]

1
browser/devtools/canvasdebugger/test/browser.ini
Просмотреть файл

@ -19,7 +19,6 @@ support-files =
[browser_canvas-actor-test-08.js]
[browser_canvas-actor-test-09.js]
[browser_canvas-actor-test-10.js]
skip-if = e10s # Bug 1058879 - canvas debugger tests disabled with e10s
[browser_canvas-frontend-call-highlight.js]
[browser_canvas-frontend-call-list.js]
[browser_canvas-frontend-call-search.js]

47
browser/devtools/canvasdebugger/test/browser_canvas-actor-test-10.js
Просмотреть файл

@ -8,8 +8,7 @@
function ifTestingSupported() {
let { target, front } = yield initCanvasDebuggerBackend(WEBGL_BINDINGS_URL);
// XXX - use of |debuggee| here is incompatible with e10s - bug 1058879.
let debuggee = target.window.wrappedJSObject
loadFrameScripts();
let navigated = once(target, "navigate");
@ -37,20 +36,26 @@ function ifTestingSupported() {
is(firstScreenshot.pixels.length, 0,
"The first screenshot should be empty.");
let gl = debuggee.gl;
is(gl.getParameter(gl.FRAMEBUFFER_BINDING), debuggee.customFramebuffer,
is((yield evalInDebuggee("gl.getParameter(gl.FRAMEBUFFER_BINDING) === customFramebuffer")),
true,
"The debuggee's gl context framebuffer wasn't changed.");
is(gl.getParameter(gl.RENDERBUFFER_BINDING), debuggee.customRenderbuffer,
is((yield evalInDebuggee("gl.getParameter(gl.RENDERBUFFER_BINDING) === customRenderbuffer")),
true,
"The debuggee's gl context renderbuffer wasn't changed.");
is(gl.getParameter(gl.TEXTURE_BINDING_2D), debuggee.customTexture,
is((yield evalInDebuggee("gl.getParameter(gl.TEXTURE_BINDING_2D) === customTexture")),
true,
"The debuggee's gl context texture binding wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[0], 128,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[0]")),
128,
"The debuggee's gl context viewport's left coord. wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[1], 256,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[1]")),
256,
"The debuggee's gl context viewport's left coord. wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[2], 384,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[2]")),
384,
"The debuggee's gl context viewport's left coord. wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[3], 512,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[3]")),
512,
"The debuggee's gl context viewport's left coord. wasn't changed.");
let secondScreenshot = yield snapshotActor.generateScreenshotFor(functionCalls[1]);
@ -75,20 +80,26 @@ function ifTestingSupported() {
is(new Uint8Array(secondScreenshot.pixels.buffer)[3], 255,
"The second screenshot has the correct alpha component.");
gl = debuggee.gl;
is(gl.getParameter(gl.FRAMEBUFFER_BINDING), debuggee.customFramebuffer,
is((yield evalInDebuggee("gl.getParameter(gl.FRAMEBUFFER_BINDING) === customFramebuffer")),
true,
"The debuggee's gl context framebuffer still wasn't changed.");
is(gl.getParameter(gl.RENDERBUFFER_BINDING), debuggee.customRenderbuffer,
is((yield evalInDebuggee("gl.getParameter(gl.RENDERBUFFER_BINDING) === customRenderbuffer")),
true,
"The debuggee's gl context renderbuffer still wasn't changed.");
is(gl.getParameter(gl.TEXTURE_BINDING_2D), debuggee.customTexture,
is((yield evalInDebuggee("gl.getParameter(gl.TEXTURE_BINDING_2D) === customTexture")),
true,
"The debuggee's gl context texture binding still wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[0], 128,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[0]")),
128,
"The debuggee's gl context viewport's left coord. still wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[1], 256,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[1]")),
256,
"The debuggee's gl context viewport's left coord. still wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[2], 384,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[2]")),
384,
"The debuggee's gl context viewport's left coord. still wasn't changed.");
is(gl.getParameter(gl.VIEWPORT)[3], 512,
is((yield evalInDebuggee("gl.getParameter(gl.VIEWPORT)[3]")),
512,
"The debuggee's gl context viewport's left coord. still wasn't changed.");
yield removeTab(target.tab);

40
browser/devtools/canvasdebugger/test/head.js
Просмотреть файл

@ -11,19 +11,21 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
Services.prefs.setBoolPref("devtools.debugger.log", false);
let { generateUUID } = Cc['@mozilla.org/uuid-generator;1'].getService(Ci.nsIUUIDGenerator);
let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
let { CallWatcherFront } = devtools.require("devtools/server/actors/call-watcher");
let { CanvasFront } = devtools.require("devtools/server/actors/canvas");
let TiltGL = devtools.require("devtools/tilt/tilt-gl");
let TargetFactory = devtools.TargetFactory;
let Toolbox = devtools.Toolbox;
let mm = null
const FRAME_SCRIPT_UTILS_URL = "chrome://browser/content/devtools/frame-script-utils.js";
const EXAMPLE_URL = "http://example.com/browser/browser/devtools/canvasdebugger/test/";
const SIMPLE_CANVAS_URL = EXAMPLE_URL + "doc_simple-canvas.html";
const SIMPLE_BITMASKS_URL = EXAMPLE_URL + "doc_simple-canvas-bitmasks.html";
@ -48,6 +50,15 @@ registerCleanupFunction(() => {
Cu.forceGC();
});
/**
* Call manually in tests that use frame script utils after initializing
* the shader editor. Call after init but before navigating to different pages.
*/
function loadFrameScripts () {
mm = gBrowser.selectedBrowser.messageManager;
mm.loadFrameScript(FRAME_SCRIPT_UTILS_URL, false);
}
function addTab(aUrl, aWindow) {
info("Adding tab: " + aUrl);
@ -232,3 +243,30 @@ function teardown(aPanel) {
removeTab(aPanel.target.tab)
]);
}
/**
* Takes a string `script` and evaluates it directly in the content
* in potentially a different process.
*/
function evalInDebuggee (script) {
let deferred = promise.defer();
if (!mm) {
throw new Error("`loadFrameScripts()` must be called when using MessageManager.");
}
let id = generateUUID().toString();
mm.sendAsyncMessage("devtools:test:eval", { script: script, id: id });
mm.addMessageListener("devtools:test:eval:response", handler);
function handler ({ data }) {
if (id !== data.id) {
return;
}
mm.removeMessageListener("devtools:test:eval:response", handler);
deferred.resolve(data.value);
}
return deferred.promise;
}

40
browser/devtools/commandline/test/browser_cmd_settings.js
Просмотреть файл

@ -25,49 +25,49 @@ function spawnTest() {
yield gcli.load();
let settings = gcli.settings;
let tiltEnabled = settings.get("devtools.tilt.enabled");
let hideIntroEnabled = settings.get("devtools.gcli.hideIntro");
let tabSize = settings.get("devtools.editor.tabsize");
let remoteHost = settings.get("devtools.debugger.remote-host");
let tiltEnabledOrig = prefBranch.getBoolPref("devtools.tilt.enabled");
let hideIntroOrig = prefBranch.getBoolPref("devtools.gcli.hideIntro");
let tabSizeOrig = prefBranch.getIntPref("devtools.editor.tabsize");
let remoteHostOrig = prefBranch.getComplexValue(
"devtools.debugger.remote-host",
Components.interfaces.nsISupportsString).data;
info("originally: devtools.tilt.enabled = " + tiltEnabledOrig);
info("originally: devtools.gcli.hideIntro = " + hideIntroOrig);
info("originally: devtools.editor.tabsize = " + tabSizeOrig);
info("originally: devtools.debugger.remote-host = " + remoteHostOrig);
// Actual tests
is(tiltEnabled.value, tiltEnabledOrig, "tiltEnabled default");
is(hideIntroEnabled.value, hideIntroOrig, "hideIntroEnabled default");
is(tabSize.value, tabSizeOrig, "tabSize default");
is(remoteHost.value, remoteHostOrig, "remoteHost default");
tiltEnabled.setDefault();
hideIntroEnabled.setDefault();
tabSize.setDefault();
remoteHost.setDefault();
let tiltEnabledDefault = tiltEnabled.value;
let hideIntroEnabledDefault = hideIntroEnabled.value;
let tabSizeDefault = tabSize.value;
let remoteHostDefault = remoteHost.value;
tiltEnabled.value = false;
hideIntroEnabled.value = false;
tabSize.value = 42;
remoteHost.value = "example.com"
remoteHost.value = "example.com";
is(tiltEnabled.value, false, "tiltEnabled basic");
is(hideIntroEnabled.value, false, "hideIntroEnabled basic");
is(tabSize.value, 42, "tabSize basic");
is(remoteHost.value, "example.com", "remoteHost basic");
function tiltEnabledCheck(ev) {
is(ev.setting, tiltEnabled, "tiltEnabled event setting");
is(ev.value, true, "tiltEnabled event value");
is(ev.setting.value, true, "tiltEnabled event setting value");
function hideIntroEnabledCheck(ev) {
is(ev.setting, hideIntroEnabled, "hideIntroEnabled event setting");
is(ev.value, true, "hideIntroEnabled event value");
is(ev.setting.value, true, "hideIntroEnabled event setting value");
}
tiltEnabled.onChange.add(tiltEnabledCheck);
tiltEnabled.value = true;
is(tiltEnabled.value, true, "tiltEnabled change");
hideIntroEnabled.onChange.add(hideIntroEnabledCheck);
hideIntroEnabled.value = true;
is(hideIntroEnabled.value, true, "hideIntroEnabled change");
function tabSizeCheck(ev) {
is(ev.setting, tabSize, "tabSize event setting");
@ -87,7 +87,7 @@ function spawnTest() {
remoteHost.value = "y.com";
is(remoteHost.value, "y.com", "remoteHost change");
tiltEnabled.onChange.remove(tiltEnabledCheck);
hideIntroEnabled.onChange.remove(hideIntroEnabledCheck);
tabSize.onChange.remove(tabSizeCheck);
remoteHost.onChange.remove(remoteHostCheck);
@ -98,18 +98,18 @@ function spawnTest() {
}
remoteHost.onChange.add(remoteHostReCheck);
tiltEnabled.setDefault();
hideIntroEnabled.setDefault();
tabSize.setDefault();
remoteHost.setDefault();
remoteHost.onChange.remove(remoteHostReCheck);
is(tiltEnabled.value, tiltEnabledDefault, "tiltEnabled reset");
is(hideIntroEnabled.value, hideIntroEnabledDefault, "hideIntroEnabled reset");
is(tabSize.value, tabSizeDefault, "tabSize reset");
is(remoteHost.value, remoteHostDefault, "remoteHost reset");
// Cleanup
prefBranch.setBoolPref("devtools.tilt.enabled", tiltEnabledOrig);
prefBranch.setBoolPref("devtools.gcli.hideIntro", hideIntroOrig);
prefBranch.setIntPref("devtools.editor.tabsize", tabSizeOrig);
supportsString.data = remoteHostOrig;
prefBranch.setComplexValue("devtools.debugger.remote-host",

4
browser/devtools/framework/target.js
Просмотреть файл

@ -345,6 +345,10 @@ TabTarget.prototype = {
return !!this._tab;
},
get isMultiProcess() {
return !this.window;
},
get isThreadPaused() {
return !!this._isThreadPaused;
},

11
browser/devtools/framework/test/browser_toolbox_options_disable_buttons.js
Просмотреть файл

@ -74,9 +74,14 @@ function testPreferenceAndUIStateIsConsistent() {
function testToggleToolboxButtons() {
let checkNodes = [...panelWin.document.querySelectorAll("#enabled-toolbox-buttons-box > checkbox")];
let toolboxButtonNodes = [...doc.querySelectorAll(".command-button")];
let visibleButtons = toolboxButtonNodes.filter(button=>!button.hasAttribute("hidden"));
let toggleableTools = toolbox.toolboxButtons;
// Tilt is disabled in E10S mode so we skip the tilt button if E10S is
// enabled.
if (toolbox.target.isMultiProcess) {
toolboxButtonNodes = [...doc.querySelectorAll(".command-button:not(#command-button-tilt)")];
}
is (checkNodes.length, toggleableTools.length, "All of the buttons are toggleable." );
is (checkNodes.length, toolboxButtonNodes.length, "All of the DOM buttons are toggleable." );
@ -92,9 +97,9 @@ function testToggleToolboxButtons() {
"DOM buttons should match for: " + id);
is (matchedCheckboxes[0].getAttribute("label"), tool.label,
"The label for checkbox matches the tool definition.")
"The label for checkbox matches the tool definition.");
is (matchedButtons[0].getAttribute("tooltiptext"), tool.label,
"The tooltip for button matches the tool definition.")
"The tooltip for button matches the tool definition.");
}
// Store modified pref names so that they can be cleared on error.

4
browser/devtools/framework/toolbox-options.js
Просмотреть файл

@ -182,6 +182,10 @@ OptionsPanel.prototype = {
};
for (let tool of toggleableButtons) {
if (this.toolbox.target.isMultiProcess && tool.id === "command-button-tilt") {
continue;
}
enabledToolbarButtonsBox.appendChild(createCommandCheckbox(tool));
}
},

21
browser/devtools/framework/toolbox.js
Просмотреть файл

@ -691,6 +691,13 @@ Toolbox.prototype = {
if (!button) {
return false;
}
// Disable tilt in E10S mode. Removing it from the list of toolbox buttons
// allows a bunch of tests to pass without modification.
if (this.target.isMultiProcess && options.id === "command-button-tilt") {
return false;
}
return {
id: options.id,
button: button,
@ -698,7 +705,7 @@ Toolbox.prototype = {
visibilityswitch: "devtools." + options.id + ".enabled",
isTargetSupported: options.isTargetSupported ? options.isTargetSupported
: target => target.isLocalTab
}
};
}).filter(button=>button);
},
@ -724,6 +731,18 @@ Toolbox.prototype = {
}
}
});
// Tilt is handled separately because it is disabled in E10S mode. Because
// we have removed tilt from toolboxButtons we have to deal with it here.
let tiltEnabled = !this.target.isMultiProcess &&
Services.prefs.getBoolPref("devtools.command-button-tilt.enabled");
let tiltButton = this.doc.getElementById("command-button-tilt");
if (tiltEnabled) {
tiltButton.removeAttribute("hidden");
} else {
tiltButton.setAttribute("hidden", "true");
}
},
/**

9
browser/devtools/shared/frame-script-utils.js
Просмотреть файл

@ -22,6 +22,15 @@ addMessageListener("devtools:test:console", function ({ data }) {
content.console[method].apply(content.console, data);
});
// To eval in content, look at `evalInDebuggee` in the head.js of canvasdebugger
// for an example.
addMessageListener("devtools:test:eval", function ({ data }) {
sendAsyncMessage("devtools:test:eval:response", {
value: content.eval(data.script),
id: data.id
});
});
addEventListener("load", function() {
sendAsyncMessage("devtools:test:load");
}, true);

2
browser/devtools/shared/test/browser.ini
Просмотреть файл

@ -49,6 +49,8 @@ skip-if = buildapp == 'mulet'
[browser_telemetry_button_responsive.js]
[browser_telemetry_button_scratchpad.js]
[browser_telemetry_button_tilt.js]
skip-if = e10s # Bug 1086492 - Disable tilt for e10s
# Bug 937166 - Make tilt work in E10S mode
[browser_telemetry_sidebar.js]
[browser_telemetry_toolbox.js]
[browser_telemetry_toolboxtabs_canvasdebugger.js]

3
browser/devtools/tilt/test/browser.ini
Просмотреть файл

@ -1,5 +1,6 @@
[DEFAULT]
skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
skip-if = e10s # Bug 1086492 - Disable tilt for e10s
# Bug 937166 - Make tilt work in E10S mode
subsuite = devtools
support-files = head.js

41
browser/devtools/tilt/tilt-commands.js
Просмотреть файл

@ -20,13 +20,19 @@ exports.items = [
{
name: 'tilt',
description: gcli.lookup("tiltDesc"),
manual: gcli.lookup("tiltManual")
manual: gcli.lookup("tiltManual"),
hidden: true
},
{
name: 'tilt open',
description: gcli.lookup("tiltOpenDesc"),
manual: gcli.lookup("tiltOpenManual"),
hidden: true,
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
if (!Tilt.currentInstance) {
@ -59,6 +65,10 @@ exports.items = [
},
},
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
Tilt.toggle();
@ -68,6 +78,7 @@ exports.items = [
name: 'tilt translate',
description: gcli.lookup("tiltTranslateDesc"),
manual: gcli.lookup("tiltTranslateManual"),
hidden: true,
params: [
{
name: "x",
@ -85,6 +96,10 @@ exports.items = [
}
],
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
if (Tilt.currentInstance) {
@ -96,6 +111,7 @@ exports.items = [
name: 'tilt rotate',
description: gcli.lookup("tiltRotateDesc"),
manual: gcli.lookup("tiltRotateManual"),
hidden: true,
params: [
{
name: "x",
@ -120,6 +136,10 @@ exports.items = [
}
],
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
if (Tilt.currentInstance) {
@ -131,6 +151,7 @@ exports.items = [
name: 'tilt zoom',
description: gcli.lookup("tiltZoomDesc"),
manual: gcli.lookup("tiltZoomManual"),
hidden: true,
params: [
{
name: "zoom",
@ -140,6 +161,10 @@ exports.items = [
}
],
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
@ -152,7 +177,12 @@ exports.items = [
name: 'tilt reset',
description: gcli.lookup("tiltResetDesc"),
manual: gcli.lookup("tiltResetManual"),
hidden: true,
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
@ -165,7 +195,12 @@ exports.items = [
name: 'tilt close',
description: gcli.lookup("tiltCloseDesc"),
manual: gcli.lookup("tiltCloseManual"),
hidden: true,
exec: function(args, context) {
if (isMultiProcess(context)) {
return gcli.lookupFormat("notAvailableInE10S", [this.name]);
}
let chromeWindow = context.environment.chromeDocument.defaultView;
let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
@ -173,3 +208,7 @@ exports.items = [
}
}
];
function isMultiProcess(context) {
return !context.environment.window;
}

4
browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
Просмотреть файл

@ -20,6 +20,10 @@ helpDesc=Get help on the available commands
# explain the contents of the command help table.
helpAvailable=Available Commands
# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
# is not compatible with multiprocess mode (E10S).
notAvailableInE10S=The command '%1$S' is not available in multiprocess mode (E10S)
# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
# function of the console command.
consoleDesc=Commands to control the console

2
browser/modules/UITour.jsm
Просмотреть файл

@ -101,6 +101,8 @@ this.UITour = {
["help", {query: "#PanelUI-help"}],
["home", {query: "#home-button"}],
["loop", {query: "#loop-call-button"}],
["devtools", {query: "#developer-button"}],
["webide", {query: "#webide-button"}],
["forget", {
query: "#panic-button",
widgetName: "panic-button",

17
browser/modules/test/browser_UITour_availableTargets.js
Просмотреть файл

@ -9,6 +9,8 @@ let gContentWindow;
Components.utils.import("resource:///modules/UITour.jsm");
let hasWebIDE = Services.prefs.getBoolPref("devtools.webide.widget.enabled");
function test() {
requestLongerTimeout(2);
UITourTest();
@ -34,13 +36,17 @@ let tests = [
"help",
"home",
"loop",
"devtools",
"pinnedTab",
"privateWindow",
"quit",
"search",
"searchProvider",
"urlbar",
].concat(searchEngineTargets()));
...searchEngineTargets(),
...(hasWebIDE ? ["webide"] : [])
]);
ok(UITour.availableTargetsCache.has(window),
"Targets should now be cached");
done();
@ -60,6 +66,7 @@ let tests = [
"customize",
"help",
"loop",
"devtools",
"home",
"pinnedTab",
"privateWindow",
@ -67,7 +74,10 @@ let tests = [
"search",
"searchProvider",
"urlbar",
].concat(searchEngineTargets()));
...searchEngineTargets(),
...(hasWebIDE ? ["webide"] : [])
]);
ok(UITour.availableTargetsCache.has(window),
"Targets should now be cached again");
CustomizableUI.reset();
@ -93,11 +103,14 @@ let tests = [
"help",
"home",
"loop",
"devtools",
"pinnedTab",
"privateWindow",
"quit",
"urlbar",
...(hasWebIDE ? ["webide"] : [])
]);
CustomizableUI.reset();
done();
});

5
dom/icc/IccCardLockError.cpp
Просмотреть файл

@ -12,7 +12,6 @@ NS_IMPL_ISUPPORTS_INHERITED0(IccCardLockError, DOMError)
/* static */ already_AddRefed<IccCardLockError>
IccCardLockError::Constructor(const GlobalObject& aGlobal,
const nsAString& aLockType,
const nsAString& aName,
int16_t aRetryCount,
ErrorResult& aRv)
@ -24,16 +23,14 @@ IccCardLockError::Constructor(const GlobalObject& aGlobal,
}
nsRefPtr<IccCardLockError> result =
new IccCardLockError(window, aName, aLockType, aRetryCount);
new IccCardLockError(window, aName, aRetryCount);
return result.forget();
}
IccCardLockError::IccCardLockError(nsPIDOMWindow* aWindow,
const nsAString& aName,
const nsAString& aLockType,
int16_t aRetryCount)
: DOMError(aWindow, aName)
, mLockType(aLockType)
, mRetryCount(aRetryCount)
{
}

14
dom/icc/IccCardLockError.h
Просмотреть файл

@ -16,24 +16,17 @@ public:
NS_DECL_ISUPPORTS_INHERITED
IccCardLockError(nsPIDOMWindow* aWindow, const nsAString& aName,
const nsAString& aLockType, int16_t aRetryCount);
int16_t aRetryCount);
static already_AddRefed<IccCardLockError>
Constructor(const GlobalObject& aGlobal, const nsAString& aLockType,
const nsAString& aName, int16_t aRetryCount,
ErrorResult& aRv);
Constructor(const GlobalObject& aGlobal, const nsAString& aName,
int16_t aRetryCount, ErrorResult& aRv);
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// WebIDL interface
void
GetLockType(nsString& aLockType) const
{
aLockType = mLockType;
}
int16_t
RetryCount() const
{
@ -44,7 +37,6 @@ private:
~IccCardLockError() {}
private:
nsString mLockType;
int16_t mRetryCount;
};

1
dom/icc/tests/marionette/test_icc_card_lock.js
Просмотреть файл

@ -17,7 +17,6 @@ taskHelper.push(function testPinChangeFailed() {
request.onerror = function onerror() {
is(request.error.name, "IncorrectPassword");
is(request.error.lockType, "pin");
// The default pin retries is 3, failed once becomes to 2
is(request.error.retryCount, 2);

34
dom/icc/tests/marionette/test_stk_display_text.js
Просмотреть файл

@ -189,6 +189,40 @@ let tests = [
expect: {name: "display_text_cmd_20",
commandQualifier: 0x00,
text: "Toolkit Test GROUP:0xF0, 8BIT"}},
// Bug 1088573: this test case is to ensure that we provide |length| argument
// in |integer| format to GsmPDUHelper.readSeptetsToString().
{command: "D0" +
"81" + // 2-byte length encoded:
"FC" + // 252
"810301210082028102" +
"8D" +
"81" + // 2-byte length encoded:
"F0" + // 240
"00" + // 7BIT
"C332A85D9ECFC3E732685E068DDF6DF8" +
"7B5E0691CB20D96D061A87E5E131BD2C" +
"2FCF416537A8FD269741E3771B2E2FCF" +
"E76517685806B5CBF379F85C0695E774" +
"50D86C4E8FD165D0BC2E07C1D9F579BA" +
"5C97CF41E5B13CEC9E83CA7490BB0C22" +
"BFD374103C3C0795E9F232882E7FBBE3" +
"F5B20B24BBCD40E5391DC42E83DCEFB6" +
"585E06B5C3F874BBDE0691CBA071581E" +
"1ED3CBF2F21C14369BD3637458CC2EBB" +
"40C3329D5E0699DFEE313DFD76BBC3EC" +
"34BD0C0A83CAF432280C87CBDF757BB9" +
"0C8287E5207619346D1E73A0783D0D9A" +
"9FCA733A885C96BFEBEC32280C9A6689" +
"CE621654768382D529551A64268B2E",
func: testDisplayText,
expect: {name: "display_text_cmd_21",
commandQualifier: 0x00,
text: "Ce message se compose de 273 caracteres en mode " +
"compresse. Ce message est affiche sur plusieurs " +
"ecrans et ne doit pas etre tronque. 273 est le " +
"nombre maximum de caracteres affichable. Cette " +
"fonctionnalite a ete approuvee par le SMG9 qui s'est " +
"deroule a SYDNEY en AUSTRALIE."}},
];
runNextTest();

19
dom/mobileconnection/Assertions.cpp
Просмотреть файл

@ -28,5 +28,24 @@ ASSERT_MOBILE_RADIO_STATE_EQUALITY(Disabled, MOBILE_RADIO_STATE_DISABLED);
#undef ASSERT_MOBILE_RADIO_STATE_EQUALITY
#define ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(webidlState, xpidlState) \
static_assert(static_cast<int32_t>(MobilePreferredNetworkType::webidlState) == nsIMobileConnection::xpidlState, \
"MobilePreferredNetworkType::" #webidlState " should equal to nsIMobileConnection::" #xpidlState)
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Wcdma_gsm, PREFERRED_NETWORK_TYPE_WCDMA_GSM);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Gsm, PREFERRED_NETWORK_TYPE_GSM_ONLY);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Wcdma, PREFERRED_NETWORK_TYPE_WCDMA_ONLY);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Wcdma_gsm_auto, PREFERRED_NETWORK_TYPE_WCDMA_GSM_AUTO);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Cdma_evdo, PREFERRED_NETWORK_TYPE_CDMA_EVDO);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Cdma, PREFERRED_NETWORK_TYPE_CDMA_ONLY);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Evdo, PREFERRED_NETWORK_TYPE_EVDO_ONLY);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Wcdma_gsm_cdma_evdo, PREFERRED_NETWORK_TYPE_WCDMA_GSM_CDMA_EVDO);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Lte_cdma_evdo, PREFERRED_NETWORK_TYPE_LTE_CDMA_EVDO);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Lte_wcdma_gsm, PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Lte_wcdma_gsm_cdma_evdo, PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM_CDMA_EVDO);
ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY(Lte, PREFERRED_NETWORK_TYPE_LTE_ONLY);
#undef ASSERT_PREFERRED_NETWORK_TYPE_EQUALITY
} // namespace dom
} // namespace mozilla

3
dom/mobileconnection/MobileConnection.cpp
Просмотреть файл

@ -477,8 +477,7 @@ MobileConnection::SetPreferredNetworkType(MobilePreferredNetworkType& aType,
return nullptr;
}
nsAutoString type;
CONVERT_ENUM_TO_STRING(MobilePreferredNetworkType, aType, type);
int32_t type = static_cast<int32_t>(aType);
nsRefPtr<DOMRequest> request = new DOMRequest(GetOwner());
nsRefPtr<MobileConnectionCallback> requestCallback =

19
dom/mobileconnection/MobileConnectionCallback.cpp
Просмотреть файл

@ -15,6 +15,13 @@ namespace mozilla {
namespace dom {
namespace mobileconnection {
#define CONVERT_ENUM_TO_STRING(_enumType, _enum, _string) \
{ \
uint32_t index = uint32_t(_enum); \
_string.AssignASCII(_enumType##Values::strings[index].value, \
_enumType##Values::strings[index].length); \
}
NS_IMPL_ISUPPORTS(MobileConnectionCallback, nsIMobileConnectionCallback)
MobileConnectionCallback::MobileConnectionCallback(nsPIDOMWindow* aWindow,
@ -349,6 +356,18 @@ MobileConnectionCallback::NotifyGetClirStatusSuccess(uint16_t aN, uint16_t aM)
return NotifySuccess(jsResult);
};
NS_IMETHODIMP
MobileConnectionCallback::NotifyGetPreferredNetworkTypeSuccess(int32_t aType)
{
MOZ_ASSERT(aType < static_cast<int32_t>(MobilePreferredNetworkType::EndGuard_));
MobilePreferredNetworkType type = static_cast<MobilePreferredNetworkType>(aType);
nsAutoString typeString;
CONVERT_ENUM_TO_STRING(MobilePreferredNetworkType, type, typeString);
return NotifySuccessWithString(typeString);
};
NS_IMETHODIMP
MobileConnectionCallback::NotifyError(const nsAString& aName,
const nsAString& aMessage,

2
dom/mobileconnection/gonk/MobileConnectionService.js
Просмотреть файл

@ -774,7 +774,7 @@ MobileConnectionProvider.prototype = {
return false;
}
aCallback.notifySuccessWithString(aResponse.type);
aCallback.notifyGetPreferredNetworkTypeSuccess(aResponse.type);
return false;
}).bind(this));
},

39
dom/mobileconnection/interfaces/nsIMobileConnectionService.idl
Просмотреть файл

@ -124,7 +124,7 @@ interface nsIMobileConnectionListener : nsISupports
#define NO_ADDITIONAL_INFORMATION 0
%}
[scriptable, builtinclass, uuid(05568ae9-9873-46c6-9acd-0f6994cde756)]
[scriptable, builtinclass, uuid(413e8bff-9f65-41a0-953f-b82e6cdbc00d)]
interface nsIMobileConnectionCallback : nsISupports
{
/**
@ -166,6 +166,8 @@ interface nsIMobileConnectionCallback : nsISupports
void notifyGetClirStatusSuccess(in unsigned short n, in unsigned short m);
void notifyGetPreferredNetworkTypeSuccess(in long type);
/**
* notifyError() will be called, when request is failed.
*/
@ -233,7 +235,7 @@ already_AddRefed<nsIMobileConnectionService>
NS_CreateMobileConnectionService();
%}
[scriptable, uuid(99818dc7-e770-4249-87e2-2de0a928ed08)]
[scriptable, uuid(d6b15551-d290-4e38-9749-d21eb35cdaf1)]
interface nsIMobileConnection : nsISupports
{
/*
@ -310,6 +312,22 @@ interface nsIMobileConnection : nsISupports
const long MOBILE_RADIO_STATE_DISABLING = 2;
const long MOBILE_RADIO_STATE_DISABLED = 3;
/**
* Preferred network type.
*/
const long PREFERRED_NETWORK_TYPE_WCDMA_GSM = 0;
const long PREFERRED_NETWORK_TYPE_GSM_ONLY = 1;
const long PREFERRED_NETWORK_TYPE_WCDMA_ONLY = 2;
const long PREFERRED_NETWORK_TYPE_WCDMA_GSM_AUTO = 3;
const long PREFERRED_NETWORK_TYPE_CDMA_EVDO = 4;
const long PREFERRED_NETWORK_TYPE_CDMA_ONLY = 5;
const long PREFERRED_NETWORK_TYPE_EVDO_ONLY = 6;
const long PREFERRED_NETWORK_TYPE_WCDMA_GSM_CDMA_EVDO = 7;
const long PREFERRED_NETWORK_TYPE_LTE_CDMA_EVDO = 8;
const long PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM = 9;
const long PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM_CDMA_EVDO = 10;
const long PREFERRED_NETWORK_TYPE_LTE_ONLY = 11;
readonly attribute unsigned long serviceId;
/**
@ -418,11 +436,7 @@ interface nsIMobileConnection : nsISupports
* Set preferred network type.
*
* @param type
* DOMString indicates the desired preferred network type.
* Possible values: 'wcdma/gsm', 'gsm', 'wcdma', 'wcdma/gsm-auto',
* 'cdma/evdo', 'cdma', 'evdo', 'wcdma/gsm/cdma/evdo',
* 'lte/cdma/evdo', 'lte/wcdma/gsm', 'lte/wcdma/gsm/cdma/evdo' or
* 'lte'.
* One of the nsIMobileConnection.PREFERRED_NETWORK_TYPE_* values.
* @param requestCallback
* Called when request is finished.
*
@ -432,7 +446,7 @@ interface nsIMobileConnection : nsISupports
* 'RadioNotAvailable', 'RequestNotSupported', 'InvalidParameter',
* 'IllegalSIMorME', or 'GenericFailure'.
*/
void setPreferredNetworkType(in DOMString type,
void setPreferredNetworkType(in long type,
in nsIMobileConnectionCallback requestCallback);
/**
@ -441,11 +455,10 @@ interface nsIMobileConnection : nsISupports
* @param requestCallback
* Called when request is finished.
*
* If successful, the notifySuccessString() will be called. And the result
* will be a string indicating the current preferred network type. The value
* will be either 'wcdma/gsm', 'gsm', 'wcdma', 'wcdma/gsm-auto', 'cdma/evdo',
* 'cdma', 'evdo', 'wcdma/gsm/cdma/evdo', 'lte/cdma/evdo', 'lte/wcdma/gsm',
* 'lte/wcdma/gsm/cdma/evdo' or 'lte'.
* If successful, the notifyGetPreferredNetworkTypeSuccess() will be called,
* and the result 'type' will be one of the
* nsIMobileConnection.PREFERRED_NETWORK_TYPE_* values, indicating the current
* preferred network type.
*
* Otherwise, the notifyError() will be called, and the error will be either
* 'RadioNotAvailable', 'RequestNotSupported', 'IllegalSIMorME', or

13
dom/mobileconnection/ipc/MobileConnectionChild.cpp
Просмотреть файл

@ -178,11 +178,10 @@ MobileConnectionChild::SelectNetworkAutomatically(nsIMobileConnectionCallback* a
NS_IMETHODIMP
MobileConnectionChild::SetPreferredNetworkType(const nsAString& aType,
MobileConnectionChild::SetPreferredNetworkType(int32_t aType,
nsIMobileConnectionCallback* aCallback)
{
return SendRequest(SetPreferredNetworkTypeRequest(nsAutoString(aType)),
aCallback)
return SendRequest(SetPreferredNetworkTypeRequest(aType), aCallback)
? NS_OK : NS_ERROR_FAILURE;
}
@ -661,6 +660,12 @@ MobileConnectionRequestChild::DoReply(const MobileConnectionReplySuccessClirStat
aReply.m()));
}
bool
MobileConnectionRequestChild::DoReply(const MobileConnectionReplySuccessPreferredNetworkType& aReply)
{
return NS_SUCCEEDED(mRequestCallback->NotifyGetPreferredNetworkTypeSuccess(aReply.type()));
}
bool
MobileConnectionRequestChild::DoReply(const MobileConnectionReplyError& aReply)
{
@ -715,6 +720,8 @@ MobileConnectionRequestChild::Recv__delete__(const MobileConnectionReply& aReply
return DoReply(aReply.get_MobileConnectionReplySuccessCallBarring());
case MobileConnectionReply::TMobileConnectionReplySuccessClirStatus:
return DoReply(aReply.get_MobileConnectionReplySuccessClirStatus());
case MobileConnectionReply::TMobileConnectionReplySuccessPreferredNetworkType:
return DoReply(aReply.get_MobileConnectionReplySuccessPreferredNetworkType());
case MobileConnectionReply::TMobileConnectionReplyError:
return DoReply(aReply.get_MobileConnectionReplyError());
case MobileConnectionReply::TMobileConnectionReplyErrorMmi:

3
dom/mobileconnection/ipc/MobileConnectionChild.h
Просмотреть файл

@ -163,6 +163,9 @@ public:
bool
DoReply(const MobileConnectionReplySuccessClirStatus& aReply);
bool
DoReply(const MobileConnectionReplySuccessPreferredNetworkType& aReply);
bool
DoReply(const MobileConnectionReplyError& aReply);

6
dom/mobileconnection/ipc/MobileConnectionParent.cpp
Просмотреть файл

@ -642,6 +642,12 @@ MobileConnectionRequestParent::NotifyGetClirStatusSuccess(uint16_t aN,
return SendReply(MobileConnectionReplySuccessClirStatus(aN, aM));
}
NS_IMETHODIMP
MobileConnectionRequestParent::NotifyGetPreferredNetworkTypeSuccess(int32_t aType)
{
return SendReply(MobileConnectionReplySuccessPreferredNetworkType(aType));
}
NS_IMETHODIMP
MobileConnectionRequestParent::NotifyError(const nsAString& aName,
const nsAString& aMessage,

2
dom/mobileconnection/ipc/PMobileConnection.ipdl
Просмотреть файл

@ -72,7 +72,7 @@ struct SelectNetworkAutoRequest
struct SetPreferredNetworkTypeRequest
{
nsString type;
int32_t type;
};
struct GetPreferredNetworkTypeRequest

6
dom/mobileconnection/ipc/PMobileConnectionRequest.ipdl
Просмотреть файл

@ -70,6 +70,11 @@ struct MobileConnectionReplySuccessClirStatus
uint16_t m;
};
struct MobileConnectionReplySuccessPreferredNetworkType
{
int32_t type;
};
// Error
struct MobileConnectionReplyError
{
@ -95,6 +100,7 @@ union MobileConnectionReply
MobileConnectionReplySuccessCallForwarding;
MobileConnectionReplySuccessCallBarring;
MobileConnectionReplySuccessClirStatus;
MobileConnectionReplySuccessPreferredNetworkType;
// Error
MobileConnectionReplyError;
MobileConnectionReplyErrorMmi;

78
dom/system/gonk/GonkGPSGeolocationProvider.cpp
Просмотреть файл

@ -32,6 +32,9 @@
#include "nsServiceManagerUtils.h"
#include "nsThreadUtils.h"
#include "prtime.h"
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/dom/SettingChangeNotificationBinding.h"
#ifdef MOZ_B2G_RIL
#include "nsIIccInfo.h"
@ -48,6 +51,7 @@
#define FLUSH_AIDE_DATA 0
using namespace mozilla;
using namespace mozilla::dom;
static const int kDefaultPeriod = 1000; // ms
static bool gDebug_isLoggingEnabled = false;
@ -400,9 +404,21 @@ GonkGPSGeolocationProvider::RequestSettingValue(const char* aKey)
MOZ_ASSERT(ss);
return;
}
nsCOMPtr<nsISettingsServiceLock> lock;
ss->CreateLock(nullptr, getter_AddRefs(lock));
lock->Get(aKey, this);
nsresult rv = ss->CreateLock(nullptr, getter_AddRefs(lock));
if (NS_FAILED(rv)) {
nsContentUtils::LogMessageToConsole(
"geo: error while createLock setting '%s': %d\n", aKey, rv);
return;
}
rv = lock->Get(aKey, this);
if (NS_FAILED(rv)) {
nsContentUtils::LogMessageToConsole(
"geo: error while get setting '%s': %d\n", aKey, rv);
return;
}
}
#ifdef MOZ_B2G_RIL
@ -814,6 +830,10 @@ GonkGPSGeolocationProvider::Startup()
{
MOZ_ASSERT(NS_IsMainThread());
if (mStarted) {
return NS_OK;
}
RequestSettingValue(kSettingDebugEnabled);
RequestSettingValue(kSettingDebugGpsIgnored);
@ -826,10 +846,6 @@ GonkGPSGeolocationProvider::Startup()
}
}
if (mStarted) {
return NS_OK;
}
if (!mInitThread) {
nsresult rv = NS_NewThread(getter_AddRefs(mInitThread));
NS_ENSURE_SUCCESS(rv, rv);
@ -868,6 +884,7 @@ GonkGPSGeolocationProvider::Shutdown()
if (!mStarted) {
return NS_OK;
}
mStarted = false;
if (mNetworkLocationProvider) {
mNetworkLocationProvider->Shutdown();
@ -876,10 +893,17 @@ GonkGPSGeolocationProvider::Shutdown()
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
if (obs) {
nsresult rv;
#ifdef MOZ_B2G_RIL
obs->RemoveObserver(this, kNetworkConnStateChangedTopic);
rv = obs->RemoveObserver(this, kNetworkConnStateChangedTopic);
if (NS_FAILED(rv)) {
NS_WARNING("geo: Gonk GPS network state RemoveObserver failed");
}
#endif
obs->RemoveObserver(this, kMozSettingsChangedTopic);
rv = obs->RemoveObserver(this, kMozSettingsChangedTopic);
if (NS_FAILED(rv)) {
NS_WARNING("geo: Gonk GPS mozsettings RemoveObserver failed");
}
}
mInitThread->Dispatch(NS_NewRunnableMethod(this, &GonkGPSGeolocationProvider::ShutdownGPS),
@ -991,8 +1015,30 @@ GonkGPSGeolocationProvider::Observe(nsISupports* aSubject,
#endif
if (!strcmp(aTopic, kMozSettingsChangedTopic)) {
RequestSettingValue(kSettingDebugEnabled);
RequestSettingValue(kSettingDebugGpsIgnored);
// Read changed setting value
AutoJSAPI jsapi;
jsapi.Init();
JSContext* cx = jsapi.cx();
RootedDictionary<SettingChangeNotification> setting(cx);
if (!WrappedJSToDictionary(cx, aSubject, setting)) {
return NS_OK;
}
if (setting.mKey.EqualsASCII(kSettingDebugGpsIgnored)) {
nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: ignoring\n");
gDebug_isGPSLocationIgnored =
setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false;
if (gDebug_isLoggingEnabled) {
nsContentUtils::LogMessageToConsole("geo: Debug: GPS ignored %d\n",
gDebug_isGPSLocationIgnored);
}
return NS_OK;
} else if (setting.mKey.EqualsASCII(kSettingDebugEnabled)) {
nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: logging\n");
gDebug_isLoggingEnabled =
setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false;
return NS_OK;
}
}
return NS_OK;
@ -1020,18 +1066,8 @@ GonkGPSGeolocationProvider::Handle(const nsAString& aName,
SetAGpsDataConn(apn);
}
}
} else
#endif // MOZ_B2G_RIL
if (aName.EqualsASCII(kSettingDebugGpsIgnored)) {
gDebug_isGPSLocationIgnored = aResult.isBoolean() ? aResult.toBoolean() : false;
if (gDebug_isLoggingEnabled) {
nsContentUtils::LogMessageToConsole("geo: Debug: GPS ignored %d\n", gDebug_isGPSLocationIgnored);
}
return NS_OK;
} else if (aName.EqualsASCII(kSettingDebugEnabled)) {
gDebug_isLoggingEnabled = aResult.isBoolean() ? aResult.toBoolean() : false;
return NS_OK;
}
#endif // MOZ_B2G_RIL
return NS_OK;
}

3
dom/system/gonk/RILContentHelper.js
Просмотреть файл

@ -683,8 +683,7 @@ RILContentHelper.prototype = {
} else {
if (data.rilMessageType == "iccSetCardLock" ||
data.rilMessageType == "iccUnlockCardLock") {
let cardLockError = new requestWindow.IccCardLockError(data.lockType,
data.errorMsg,
let cardLockError = new requestWindow.IccCardLockError(data.errorMsg,
data.retryCount);
this.fireRequestDetailedError(requestId, cardLockError);
} else {

28
dom/system/gonk/ril_worker.js
Просмотреть файл

@ -1333,8 +1333,8 @@ RilObject.prototype = {
* RIL_PREFERRED_NETWORK_TYPE_TO_GECKO as its `type` attribute.
*/
setPreferredNetworkType: function(options) {
let networkType = RIL_PREFERRED_NETWORK_TYPE_TO_GECKO.indexOf(options.type);
if (networkType < 0) {
let networkType = options.type;
if (networkType < 0 || networkType >= RIL_PREFERRED_NETWORK_TYPE_TO_GECKO.length) {
options.errorMsg = GECKO_ERROR_INVALID_PARAMETER;
this.sendChromeMessage(options);
return;
@ -5874,6 +5874,12 @@ RilObject.prototype[REQUEST_QUERY_CALL_WAITING] =
options.success = (options.rilRequestError === 0);
if (!options.success) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
if (options.callback) {
// Prevent DataCloneError when sending chrome messages.
delete options.callback;
}
this.sendChromeMessage(options);
return;
}
@ -5894,6 +5900,12 @@ RilObject.prototype[REQUEST_SET_CALL_WAITING] = function REQUEST_SET_CALL_WAITIN
options.success = (options.rilRequestError === 0);
if (!options.success) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
if (options.callback) {
// Prevent DataCloneError when sending chrome messages.
delete options.callback;
}
this.sendChromeMessage(options);
return;
}
@ -6292,8 +6304,7 @@ RilObject.prototype[REQUEST_GET_PREFERRED_NETWORK_TYPE] = function REQUEST_GET_P
return;
}
let networkType = this.context.Buf.readInt32List()[0];
options.type = RIL_PREFERRED_NETWORK_TYPE_TO_GECKO[networkType];
options.type = this.context.Buf.readInt32List()[0];
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_GET_NEIGHBORING_CELL_IDS] = function REQUEST_GET_NEIGHBORING_CELL_IDS(length, options) {
@ -8519,7 +8530,7 @@ GsmPDUHelperObject.prototype = {
switch (msg.encoding) {
case PDU_DCS_MSG_CODING_7BITS_ALPHABET:
msg.body = this.readSeptetsToString.call(bufAdapter,
(length * 8 / 7), 0,
Math.floor(length * 8 / 7), 0,
PDU_NL_IDENTIFIER_DEFAULT,
PDU_NL_IDENTIFIER_DEFAULT);
if (msg.hasLanguageIndicator) {
@ -8616,7 +8627,7 @@ GsmPDUHelperObject.prototype = {
msg.body = "";
for (let i = 0; i < numOfPages; i++) {
body = this.readSeptetsToString.call(bufAdapter,
(pageLengths[i] * 8 / 7),
Math.floor(pageLengths[i] * 8 / 7),
0,
PDU_NL_IDENTIFIER_DEFAULT,
PDU_NL_IDENTIFIER_DEFAULT);
@ -8846,7 +8857,7 @@ GsmPDUHelperObject.prototype = {
case 0:
// GSM Default alphabet.
resultString = this.readSeptetsToString(
((len - 1) * 8 - spareBits) / 7, 0,
Math.floor(((len - 1) * 8 - spareBits) / 7), 0,
PDU_NL_IDENTIFIER_DEFAULT,
PDU_NL_IDENTIFIER_DEFAULT);
break;
@ -11261,7 +11272,8 @@ StkProactiveCmdHelperObject.prototype = {
length--; // -1 for the codingScheme.
switch (text.codingScheme & 0x0c) {
case STK_TEXT_CODING_GSM_7BIT_PACKED:
text.textString = GsmPDUHelper.readSeptetsToString(length * 8 / 7, 0, 0, 0);
text.textString =
GsmPDUHelper.readSeptetsToString(Math.floor(length * 8 / 7), 0, 0, 0);
break;
case STK_TEXT_CODING_GSM_8BIT:
text.textString =

366
dom/tv/FakeTVService.cpp
Просмотреть файл

@ -5,19 +5,113 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/TVServiceRunnables.h"
#include "mozilla/dom/TVTypes.h"
#include "nsCOMPtr.h"
#include "nsIMutableArray.h"
#include "nsITimer.h"
#include "nsServiceManagerUtils.h"
#include "prtime.h"
#include "FakeTVService.h"
namespace mozilla {
namespace dom {
NS_IMPL_ISUPPORTS(FakeTVService, nsITVService)
NS_IMPL_CYCLE_COLLECTION_CLASS(FakeTVService)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(FakeTVService)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSourceListener)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTuners)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChannels)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrograms)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mEITBroadcastedTimer)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mScanCompleteTimer)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(FakeTVService)
tmp->Shutdown();
NS_IMPL_CYCLE_COLLECTION_UNLINK(mSourceListener)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mTuners)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mChannels)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mPrograms)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mEITBroadcastedTimer)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mScanCompleteTimer)
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(FakeTVService)
NS_IMPL_CYCLE_COLLECTING_RELEASE(FakeTVService)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FakeTVService)
NS_INTERFACE_MAP_ENTRY(nsITVService)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
FakeTVService::FakeTVService()
{
Init();
}
FakeTVService::~FakeTVService()
{
Shutdown();
}
void
FakeTVService::Init()
{
const char* sourceTypes1[2] = {"dvb-t", "dvb-c"};
nsCOMPtr<nsITVTunerData> tunerData1 = MockTuner(NS_LITERAL_STRING("1"), 2, sourceTypes1);
mTuners.AppendElement(tunerData1);
const char* sourceTypes2[1] = {"dvb-s"};
nsCOMPtr<nsITVTunerData> tunerData2 = MockTuner(NS_LITERAL_STRING("2"), 1, sourceTypes2);
mTuners.AppendElement(tunerData2);
nsCOMPtr<nsITVChannelData> channelData1 =
MockChannel(NS_LITERAL_STRING("networkId1"), NS_LITERAL_STRING("transportStreamId1"),
NS_LITERAL_STRING("serviceId1"), NS_LITERAL_STRING("tv"),
NS_LITERAL_STRING("1"), NS_LITERAL_STRING("name1"), true, true);
mChannels.AppendElement(channelData1);
nsCOMPtr<nsITVChannelData> channelData2 =
MockChannel(NS_LITERAL_STRING("networkId2"), NS_LITERAL_STRING("transportStreamId2"),
NS_LITERAL_STRING("serviceId2"), NS_LITERAL_STRING("radio"),
NS_LITERAL_STRING("2"), NS_LITERAL_STRING("name2"), true, true);
mChannels.AppendElement(channelData2);
uint64_t now = PR_Now();
const char* audioLanguages1[2] = {"eng", "jpn"};
const char* subtitleLanguages1[2] = {"fre", "spa"};
nsCOMPtr<nsITVProgramData> programData1 =
MockProgram(NS_LITERAL_STRING("eventId1"), NS_LITERAL_STRING("title1"),
now - 1, 3600000,
NS_LITERAL_STRING("description1"), NS_LITERAL_STRING("rating1"),
2, audioLanguages1, 2, subtitleLanguages1);
mPrograms.AppendElement(programData1);
nsCOMPtr<nsITVProgramData> programData2 =
MockProgram(NS_LITERAL_STRING("eventId2"), NS_LITERAL_STRING("title2"),
now + 3600000 , 3600000,
NS_LITERAL_STRING(""), NS_LITERAL_STRING(""),
0, nullptr, 0, nullptr);
mPrograms.AppendElement(programData2);
}
void
FakeTVService::Shutdown()
{
if (mEITBroadcastedTimer) {
mEITBroadcastedTimer->Cancel();
}
if (mScanCompleteTimer) {
mScanCompleteTimer->Cancel();
}
}
/* virtual */ NS_IMETHODIMP
FakeTVService::GetSourceListener(nsITVSourceListener** aSourceListener)
{
if (!mSourceListener) {
*aSourceListener = nullptr;
return NS_OK;
}
*aSourceListener = mSourceListener;
NS_ADDREF(*aSourceListener);
return NS_OK;
@ -42,7 +136,9 @@ FakeTVService::GetTuners(nsITVServiceCallback* aCallback)
return NS_ERROR_OUT_OF_MEMORY;
}
// TODO Implement in follow-up patches.
for (uint32_t i = 0; i < mTuners.Length(); i++) {
tunerDataList->AppendElement(mTuners[i], false);
}
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, tunerDataList);
@ -58,13 +154,109 @@ FakeTVService::SetSource(const nsAString& aTunerId,
return NS_ERROR_INVALID_ARG;
}
// TODO Implement in follow-up patches.
for (uint32_t i = 0; i < mTuners.Length(); i++) {
nsString tunerId;
mTuners[i]->GetId(tunerId);
if (aTunerId.Equals(tunerId)) {
uint32_t sourceTypeCount;
char** sourceTypes;
mTuners[i]->GetSupportedSourceTypes(&sourceTypeCount, &sourceTypes);
for (uint32_t j = 0; j < sourceTypeCount; j++) {
nsString sourceType;
sourceType.AssignASCII(sourceTypes[j]);
if (aSourceType.Equals(sourceType)) {
NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(sourceTypeCount, sourceTypes);
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, nullptr);
return NS_DispatchToCurrentThread(runnable);
}
}
NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(sourceTypeCount, sourceTypes);
}
}
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, nullptr);
new TVServiceNotifyRunnable(aCallback, nullptr, nsITVServiceCallback::TV_ERROR_FAILURE);
return NS_DispatchToCurrentThread(runnable);
}
class EITBroadcastedCallback : public nsITimerCallback
{
public:
NS_DECL_ISUPPORTS
EITBroadcastedCallback(const nsAString& aTunerId,
const nsAString& aSourceType,
nsITVSourceListener* aSourceListener,
nsITVChannelData* aChannelData)
: mTunerId(aTunerId)
, mSourceType(aSourceType)
, mSourceListener(aSourceListener)
, mChannelData(aChannelData)
{}
NS_IMETHODIMP
Notify(nsITimer* aTimer)
{
// Notify mock EIT broadcasting.
nsITVProgramData** programDataList =
static_cast<nsITVProgramData **>(NS_Alloc(1 * sizeof(nsITVProgramData*)));
programDataList[0] = new TVProgramData();
programDataList[0]->SetEventId(NS_LITERAL_STRING("eventId"));
programDataList[0]->SetTitle(NS_LITERAL_STRING("title"));
programDataList[0]->SetStartTime(PR_Now() + 3600000);
programDataList[0]->SetDuration(3600000);
programDataList[0]->SetDescription(NS_LITERAL_STRING("description"));
programDataList[0]->SetRating(NS_LITERAL_STRING("rating"));
programDataList[0]->SetAudioLanguages(0, nullptr);
programDataList[0]->SetSubtitleLanguages(0, nullptr);
nsresult rv = mSourceListener->NotifyEITBroadcasted(mTunerId, mSourceType,
mChannelData,
programDataList, 1);
NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(1, programDataList);
return rv;
}
private:
~EITBroadcastedCallback() {}
nsString mTunerId;
nsString mSourceType;
nsCOMPtr<nsITVSourceListener> mSourceListener;
nsCOMPtr<nsITVChannelData> mChannelData;
};
NS_IMPL_ISUPPORTS(EITBroadcastedCallback, nsITimerCallback)
class ScanCompleteCallback : public nsITimerCallback
{
public:
NS_DECL_ISUPPORTS
ScanCompleteCallback(const nsAString& aTunerId,
const nsAString& aSourceType,
nsITVSourceListener* aSourceListener)
: mTunerId(aTunerId)
, mSourceType(aSourceType)
, mSourceListener(aSourceListener)
{}
NS_IMETHODIMP
Notify(nsITimer* aTimer)
{
return mSourceListener->NotifyChannelScanComplete(mTunerId, mSourceType);
}
private:
~ScanCompleteCallback() {}
nsString mTunerId;
nsString mSourceType;
nsCOMPtr<nsITVSourceListener> mSourceListener;
};
NS_IMPL_ISUPPORTS(ScanCompleteCallback, nsITimerCallback)
/* virtual */ NS_IMETHODIMP
FakeTVService::StartScanningChannels(const nsAString& aTunerId,
const nsAString& aSourceType,
@ -74,11 +266,39 @@ FakeTVService::StartScanningChannels(const nsAString& aTunerId,
return NS_ERROR_INVALID_ARG;
}
// TODO Implement in follow-up patches.
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, nullptr);
return NS_DispatchToCurrentThread(runnable);
nsresult rv = NS_DispatchToCurrentThread(runnable);
NS_ENSURE_SUCCESS(rv, rv);
if (IsAllowed(aTunerId, aSourceType)) {
rv = mSourceListener->NotifyChannelScanned(aTunerId, aSourceType, mChannels[0]);
NS_ENSURE_SUCCESS(rv, rv);
// Set a timer. |notifyEITBroadcasted| will be called after the timer
// fires (10ms). (The timer could be canceled if |StopScanningChannels| gets
// called before firing.)
mEITBroadcastedTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
NS_ENSURE_TRUE(mEITBroadcastedTimer, NS_ERROR_OUT_OF_MEMORY);
nsRefPtr<EITBroadcastedCallback> eitBroadcastedCb =
new EITBroadcastedCallback(aTunerId, aSourceType, mSourceListener, mChannels[0]);
rv = mEITBroadcastedTimer->InitWithCallback(eitBroadcastedCb, 10,
nsITimer::TYPE_ONE_SHOT);
NS_ENSURE_SUCCESS(rv, rv);
// Set a timer. |notifyChannelScanComplete| will be called after the timer
// fires (20ms). (The timer could be canceled if |StopScanningChannels| gets
// called before firing.)
mScanCompleteTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
NS_ENSURE_TRUE(mScanCompleteTimer, NS_ERROR_OUT_OF_MEMORY);
nsRefPtr<ScanCompleteCallback> scanCompleteCb =
new ScanCompleteCallback(aTunerId, aSourceType, mSourceListener);
rv = mScanCompleteTimer->InitWithCallback(scanCompleteCb, 20,
nsITimer::TYPE_ONE_SHOT);
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_OK;
}
/* virtual */ NS_IMETHODIMP
@ -90,7 +310,16 @@ FakeTVService::StopScanningChannels(const nsAString& aTunerId,
return NS_ERROR_INVALID_ARG;
}
// TODO Implement in follow-up patches.
if (mEITBroadcastedTimer) {
mEITBroadcastedTimer->Cancel();
mEITBroadcastedTimer = nullptr;
}
if (mScanCompleteTimer) {
mScanCompleteTimer->Cancel();
mScanCompleteTimer = nullptr;
}
nsresult rv = mSourceListener->NotifyChannelScanStopped(aTunerId, aSourceType);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, nullptr);
@ -100,8 +329,7 @@ FakeTVService::StopScanningChannels(const nsAString& aTunerId,
/* virtual */ NS_IMETHODIMP
FakeTVService::ClearScannedChannelsCache()
{
// TODO Implement in follow-up patches.
// Fake service doesn't support channel cache, so there's nothing to do here.
return NS_OK;
}
@ -120,10 +348,26 @@ FakeTVService::SetChannel(const nsAString& aTunerId,
return NS_ERROR_OUT_OF_MEMORY;
}
// TODO Implement in follow-up patches.
if (IsAllowed(aTunerId, aSourceType)) {
for (uint32_t i = 0; i < mChannels.Length(); i++) {
nsString channelNumber;
mChannels[i]->GetNumber(channelNumber);
if (aChannelNumber.Equals(channelNumber)) {
channelDataList->AppendElement(mChannels[i], false);
break;
}
}
}
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, channelDataList);
uint32_t length;
nsresult rv = channelDataList->GetLength(&length);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIRunnable> runnable = new TVServiceNotifyRunnable(
aCallback,
(length == 1) ? channelDataList : nullptr,
(length == 1) ? nsITVServiceCallback::TV_ERROR_OK : nsITVServiceCallback::TV_ERROR_FAILURE
);
return NS_DispatchToCurrentThread(runnable);
}
@ -141,7 +385,11 @@ FakeTVService::GetChannels(const nsAString& aTunerId,
return NS_ERROR_OUT_OF_MEMORY;
}
// TODO Implement in follow-up patches.
if (IsAllowed(aTunerId, aSourceType)) {
for (uint32_t i = 0; i < mChannels.Length(); i++) {
channelDataList->AppendElement(mChannels[i], false);
}
}
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, channelDataList);
@ -165,7 +413,14 @@ FakeTVService::GetPrograms(const nsAString& aTunerId,
return NS_ERROR_OUT_OF_MEMORY;
}
// TODO Implement in follow-up patches.
// Only return mock programs for the first channel.
nsString channelNumber;
mChannels[0]->GetNumber(channelNumber);
if (IsAllowed(aTunerId, aSourceType) && aChannelNumber.Equals(channelNumber)) {
for (uint32_t i = 0; i < mPrograms.Length(); i++) {
programDataList->AppendElement(mPrograms[i], false);
}
}
nsCOMPtr<nsIRunnable> runnable =
new TVServiceNotifyRunnable(aCallback, programDataList);
@ -192,5 +447,86 @@ FakeTVService::GetOverlayId(const nsAString& aTunerId,
return NS_DispatchToCurrentThread(runnable);
}
bool
FakeTVService::IsAllowed(const nsAString& aTunerId,
const nsAString& aSourceType)
{
// Only allow for the first source of the first tuner.
nsString tunerId;
mTuners[0]->GetId(tunerId);
if (!aTunerId.Equals(tunerId)) {
return false;
}
uint32_t sourceTypeCount;
char** sourceTypes;
mTuners[0]->GetSupportedSourceTypes(&sourceTypeCount, &sourceTypes);
nsString sourceType;
sourceType.AssignASCII(sourceTypes[0]);
NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(sourceTypeCount, sourceTypes);
if (!aSourceType.Equals(sourceType)) {
return false;
}
return true;
}
already_AddRefed<nsITVTunerData>
FakeTVService::MockTuner(const nsAString& aId,
uint32_t aSupportedSourceTypeCount,
const char** aSupportedSourceTypes)
{
nsCOMPtr<nsITVTunerData> tunerData = new TVTunerData();
tunerData->SetId(aId);
tunerData->SetSupportedSourceTypes(aSupportedSourceTypeCount, aSupportedSourceTypes);
return tunerData.forget();
}
already_AddRefed<nsITVChannelData>
FakeTVService::MockChannel(const nsAString& aNetworkId,
const nsAString& aTransportStreamId,
const nsAString& aServiceId,
const nsAString& aType,
const nsAString& aNumber,
const nsAString& aName,
bool aIsEmergency,
bool aIsFree)
{
nsCOMPtr<nsITVChannelData> channelData = new TVChannelData();
channelData->SetNetworkId(aNetworkId);
channelData->SetTransportStreamId(aTransportStreamId);
channelData->SetServiceId(aServiceId);
channelData->SetType(aType);
channelData->SetNumber(aNumber);
channelData->SetName(aName);
channelData->SetIsEmergency(aIsEmergency);
channelData->SetIsFree(aIsFree);
return channelData.forget();
}
already_AddRefed<nsITVProgramData>
FakeTVService::MockProgram(const nsAString& aEventId,
const nsAString& aTitle,
uint64_t aStartTime,
uint64_t aDuration,
const nsAString& aDescription,
const nsAString& aRating,
uint32_t aAudioLanguageCount,
const char** aAudioLanguages,
uint32_t aSubtitleLanguageCount,
const char** aSubtitleLanguages)
{
nsCOMPtr<nsITVProgramData> programData = new TVProgramData();
programData->SetEventId(aEventId);
programData->SetTitle(aTitle);
programData->SetStartTime(aStartTime);
programData->SetDuration(aDuration);
programData->SetDescription(aDescription);
programData->SetRating(aRating);
programData->SetAudioLanguages(aAudioLanguageCount, aAudioLanguages);
programData->SetSubtitleLanguages(aSubtitleLanguageCount, aSubtitleLanguages);
return programData.forget();
}
} // namespace dom
} // namespace mozilla

54
dom/tv/FakeTVService.h
Просмотреть файл

@ -8,30 +8,74 @@
#define mozilla_dom_FakeTVService_h
#include "nsCOMPtr.h"
#include "nsCycleCollectionParticipant.h"
#include "nsITVService.h"
#include "nsTArray.h"
#define FAKE_TV_SERVICE_CONTRACTID \
"@mozilla.org/tv/faketvservice;1"
#define FAKE_TV_SERVICE_CID \
{ 0x60fb3c53, 0x017f, 0x4340, { 0x91, 0x1b, 0xd5, 0x5c, 0x31, 0x28, 0x88, 0xb6 } }
class nsITimer;
class nsITVTunerData;
class nsITVChannelData;
class nsITVProgramData;
namespace mozilla {
namespace dom {
class FakeTVService MOZ_FINAL : public nsITVService
{
public:
NS_DECL_ISUPPORTS
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(FakeTVService)
NS_DECL_NSITVSERVICE
FakeTVService() {}
// TODO More members might be added in follow-up patches to help testing.
FakeTVService();
private:
~FakeTVService() {}
~FakeTVService();
void Init();
void Shutdown();
bool IsAllowed(const nsAString& aTunerId,
const nsAString& aSourceType);
already_AddRefed<nsITVTunerData> MockTuner(const nsAString& aId,
uint32_t aSupportedSourceTypeCount,
const char** aSupportedSourceTypes);
already_AddRefed<nsITVChannelData> MockChannel(const nsAString& aNetworkId,
const nsAString& aTransportStreamId,
const nsAString& aServiceId,
const nsAString& aType,
const nsAString& aNumber,
const nsAString& aName,
bool aIsEmergency,
bool aIsFree);
already_AddRefed<nsITVProgramData> MockProgram(const nsAString& aEventId,
const nsAString& aTitle,
uint64_t aStartTime,
uint64_t aDuration,
const nsAString& aDescription,
const nsAString& aRating,
uint32_t aAudioLanguageCount,
const char** aAudioLanguages,
uint32_t aSubtitleLanguageCount,
const char** aSubtitleLanguages);
nsCOMPtr<nsITVSourceListener> mSourceListener;
// The real implementation may want to use more efficient data structures.
nsTArray<nsCOMPtr<nsITVTunerData>> mTuners;
nsTArray<nsCOMPtr<nsITVChannelData>> mChannels;
nsTArray<nsCOMPtr<nsITVProgramData>> mPrograms;
nsCOMPtr<nsITimer> mEITBroadcastedTimer;
nsCOMPtr<nsITimer> mScanCompleteTimer;
};
} // namespace dom

55
dom/tv/TVListeners.cpp
Просмотреть файл

@ -12,39 +12,30 @@
namespace mozilla {
namespace dom {
NS_IMPL_ISUPPORTS(TVSourceListener, nsITVSourceListener)
NS_IMPL_CYCLE_COLLECTION(TVSourceListener, mSources)
NS_IMPL_CYCLE_COLLECTING_ADDREF(TVSourceListener)
NS_IMPL_CYCLE_COLLECTING_RELEASE(TVSourceListener)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TVSourceListener)
NS_INTERFACE_MAP_ENTRY(nsITVSourceListener)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
void
TVSourceListener::RegisterSource(TVSource* aSource)
{
nsString tunerId;
nsRefPtr<TVTuner> tuner = aSource->Tuner();
tuner->GetId(tunerId);
nsRefPtrHashtable<nsStringHashKey, TVSource>* tunerSources = nullptr;
if (!mSources.Get(tunerId, &tunerSources)) {
tunerSources = new nsRefPtrHashtable<nsStringHashKey, TVSource>();
mSources.Put(tunerId, tunerSources);
}
nsString sourceType = ToTVSourceTypeStr(aSource->Type());
tunerSources->Put(sourceType, aSource);
mSources.AppendElement(aSource);
}
void
TVSourceListener::UnregisterSource(TVSource* aSource)
{
nsString tunerId;
nsRefPtr<TVTuner> tuner = aSource->Tuner();
tuner->GetId(tunerId);
nsRefPtrHashtable<nsStringHashKey, TVSource>* tunerSources = nullptr;
if (!mSources.Get(tunerId, &tunerSources)) {
return;
for (uint32_t i = 0; i < mSources.Length(); i++) {
if (mSources[i] == aSource) {
mSources.RemoveElementsAt(i, 1);
}
}
nsString sourceType = ToTVSourceTypeStr(aSource->Type());
tunerSources->Remove(sourceType);
}
/* virtual */ NS_IMETHODIMP
@ -91,14 +82,20 @@ already_AddRefed<TVSource>
TVSourceListener::GetSource(const nsAString& aTunerId,
const nsAString& aSourceType)
{
nsRefPtrHashtable<nsStringHashKey, TVSource>* tunerSources = nullptr;
if (!mSources.Get(aTunerId, &tunerSources)) {
return nullptr;
for (uint32_t i = 0; i < mSources.Length(); i++) {
nsString tunerId;
nsRefPtr<TVTuner> tuner = mSources[i]->Tuner();
tuner->GetId(tunerId);
nsString sourceType = ToTVSourceTypeStr(mSources[i]->Type());
if (aTunerId.Equals(tunerId) && aSourceType.Equals(sourceType)) {
nsRefPtr<TVSource> source = mSources[i];
return source.forget();
}
}
nsRefPtr<TVSource> source;
tunerSources->Get(aSourceType, getter_AddRefs(source));
return source.forget();
return nullptr;
}
} // namespace dom

14
dom/tv/TVListeners.h
Просмотреть файл

@ -7,19 +7,19 @@
#ifndef mozilla_dom_TVListeners_h
#define mozilla_dom_TVListeners_h
#include "nsClassHashtable.h"
#include "mozilla/dom/TVSource.h"
#include "nsCycleCollectionParticipant.h"
#include "nsITVService.h"
#include "nsRefPtrHashtable.h"
#include "nsTArray.h"
namespace mozilla {
namespace dom {
class TVSource;
class TVSourceListener : public nsITVSourceListener
{
public:
NS_DECL_ISUPPORTS
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(TVSourceListener)
NS_DECL_NSITVSOURCELISTENER
void RegisterSource(TVSource* aSource);
@ -32,9 +32,7 @@ private:
already_AddRefed<TVSource> GetSource(const nsAString& aTunerId,
const nsAString& aSourceType);
// The tuner ID acts as the key of the outer table; whereas the source type is
// the key for the inner one.
nsClassHashtable<nsStringHashKey, nsRefPtrHashtable<nsStringHashKey, TVSource>> mSources;
nsTArray<nsRefPtr<TVSource>> mSources;
};
} // namespace dom

24
dom/tv/TVTypes.cpp
Просмотреть файл

@ -17,6 +17,12 @@ namespace dom {
NS_IMPL_ISUPPORTS(TVTunerData, nsITVTunerData)
TVTunerData::TVTunerData()
: mSupportedSourceTypes(nullptr)
, mCount(0)
{
}
TVTunerData::~TVTunerData()
{
if (mSupportedSourceTypes) {
@ -97,6 +103,16 @@ TVTunerData::SetSupportedSourceTypes(uint32_t aCount,
NS_IMPL_ISUPPORTS(TVChannelData, nsITVChannelData)
TVChannelData::TVChannelData()
: mIsEmergency(false)
, mIsFree(false)
{
}
TVChannelData::~TVChannelData()
{
}
/* virtual */ NS_IMETHODIMP
TVChannelData::GetNetworkId(nsAString& aNetworkId)
{
@ -244,6 +260,14 @@ TVChannelData::SetIsFree(bool aIsFree)
NS_IMPL_ISUPPORTS(TVProgramData, nsITVProgramData)
TVProgramData::TVProgramData()
: mAudioLanguages(nullptr)
, mAudioLanguageCount(0)
, mSubtitleLanguages(nullptr)
, mSubtitleLanguageCount(0)
{
}
TVProgramData::~TVProgramData()
{
if (mAudioLanguages) {

8
dom/tv/TVTypes.h
Просмотреть файл

@ -18,6 +18,8 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSITVTUNERDATA
TVTunerData();
private:
~TVTunerData();
@ -32,8 +34,10 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSITVCHANNELDATA
TVChannelData();
private:
~TVChannelData() {}
~TVChannelData();
nsString mNetworkId;
nsString mTransportStreamId;
@ -51,6 +55,8 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSITVPROGRAMDATA
TVProgramData();
private:
~TVProgramData();

6
dom/tv/moz.build
Просмотреть файл

@ -4,8 +4,6 @@
# 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/.
TEST_DIRS += ['test']
EXPORTS.mozilla.dom += [
'FakeTVService.h',
'TVChannel.h',
@ -40,6 +38,10 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'dom_tv'
MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'

7
dom/tv/test/mochitest.ini
Просмотреть файл

@ -1,7 +0,0 @@
[DEFAULT]
support-files =
file_app.sjs
file_app.template.webapp
file_tv_non_permitted_app.html
[test_tv_non_permitted_app.html]

2
dom/tv/test/file_app.sjs → dom/tv/test/mochitest/file_app.sjs
Просмотреть файл

@ -1,4 +1,4 @@
var gBasePath = "tests/dom/tv/test/";
var gBasePath = "tests/dom/tv/test/mochitest/";
function handleRequest(request, response) {
var query = getQuery(request);

2
dom/tv/test/file_app.template.webapp → dom/tv/test/mochitest/file_app.template.webapp
Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "TV Test App (hosted)",
"description": "Hosted TV test app used for mochitest.",
"launch_path": "/tests/dom/tv/test/TESTTOKEN",
"launch_path": "/tests/dom/tv/test/mochitest/TESTTOKEN",
"icons": { "128": "default_icon" }
}

60
dom/tv/test/mochitest/file_tv_get_channels.html Normal file
Просмотреть файл

@ -0,0 +1,60 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test GetChannels for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
aSources[0].getChannels().then(
function(aChannels) {
ok(aChannels.length > 0, "Got at least 1 channel.");
for (var i = 0; i < aChannels.length; i++) {
var channel = aChannels[i];
ok(channel instanceof TVChannel, "Channel " + i + " should be in right type.")
ok('source' in channel, "Channel " + i + " should have a source.");
ok('networkId' in channel, "Channel " + i + " should have a network ID.");
ok('transportStreamId' in channel, "Channel " + i + " should have a transport stream ID.");
ok('serviceId' in channel, "Channel " + i + " should have a service ID.");
ok('type' in channel, "Channel " + i + " should have a type.");
ok('name' in channel, "Channel " + i + " should have a name.");
ok('number' in channel, "Channel " + i + " should have a number.");
}
finish();
},
function(aError) {
ok(false, "Error occurred when getting channels: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

58
dom/tv/test/mochitest/file_tv_get_channels_during_scanning.html Normal file
Просмотреть файл

@ -0,0 +1,58 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test an error case for GetChannels during scanning for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
var source = aSources[0];
// TODO Bug 1088818 - Modify the behavior of channel scanning.
source.startScanning({}).then(
function() {
source.getChannels().then(
function() {
ok(false, "Getting channels during scanning should get error.");
finish();
},
function(aError) {
is(aError.name, "InvalidStateError",
"InvalidStateError should be expected.");
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when starting scanning: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

68
dom/tv/test/mochitest/file_tv_get_current_program.html Normal file
Просмотреть файл

@ -0,0 +1,68 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test GetCurrentProgram for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
aSources[0].getChannels().then(
function(aChannels) {
ok(aChannels.length > 0, "Got at least 1 channel.");
aChannels[0].getCurrentProgram().then(
function(aCurrentProgram) {
ok(aCurrentProgram, "Got the current program.");
ok(aCurrentProgram instanceof TVProgram, "The current program should be in the right type.")
ok('channel' in aCurrentProgram, "The current program should have a channel.");
ok('eventId' in aCurrentProgram, "The current program should have an event ID.");
ok('title' in aCurrentProgram, "The current program should have a title.");
ok('startTime' in aCurrentProgram, "The current program should have start time.");
ok('duration' in aCurrentProgram, "The current program should have duration.");
ok(aCurrentProgram.getAudioLanguages().length >= 0,
"The current program may have audio language(s).");
ok(aCurrentProgram.getSubtitleLanguages().length >= 0,
"The current program may have subtitle language(s).");
finish();
},
function(aError) {
ok(false, "Error occurred when getting programs: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting channels: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

71
dom/tv/test/mochitest/file_tv_get_programs.html Normal file
Просмотреть файл

@ -0,0 +1,71 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test GetPrograms for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
aSources[0].getChannels().then(
function(aChannels) {
ok(aChannels.length > 0, "Got at least 1 channel.");
aChannels[0].getPrograms().then(
function(aPrograms) {
ok(aPrograms.length > 0, "Got at least 1 program.");
for (var i = 0; i < aPrograms.length; i++) {
var program = aPrograms[i];
ok(program instanceof TVProgram, "Program " + i + " should be in the right type.")
ok('channel' in program, "Program " + i + " should have a channel.");
ok('eventId' in program, "Program " + i + " should have an event ID.");
ok('title' in program, "Program " + i + " should have a title.");
ok('startTime' in program, "Program " + i + " should have start time.");
ok('duration' in program, "Program " + i + " should have duration.");
ok(program.getAudioLanguages().length >= 0,
"Program " + i + " may have audio language(s).");
ok(program.getSubtitleLanguages().length >= 0,
"Program " + i + " may have subtitle language(s).");
}
finish();
},
function(aError) {
ok(false, "Error occurred when getting programs: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting channels: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

49
dom/tv/test/mochitest/file_tv_get_sources.html Normal file
Просмотреть файл

@ -0,0 +1,49 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test GetSources for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
for (var i = 0; i < aSources.length; i++) {
var source = aSources[i];
ok(source instanceof TVSource, "Source " + i + " should be in the right type.");
ok('tuner' in source, "Source " + i + " should have a tuner.");
ok('type' in source, "Source " + i + " should have a type.");
ok('isScanning' in source, "Source " + i + " should have isScanning.");
ok(!source.isScanning,
"Source " + i + " should not be scanning by default.");
ok(!source.currentChannel,
"Source " + i + " should have no current channel by default.");
}
finish();
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

38
dom/tv/test/mochitest/file_tv_get_tuners.html Normal file
Просмотреть файл

@ -0,0 +1,38 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test GetTuners for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
for (var i = 0; i < aTuners.length; i++) {
var tuner = aTuners[i];
ok(tuner instanceof TVTuner, "Tuner " + i + " should be in the right type.");
ok('id' in tuner, "Tuner " + i + " should have an ID.");
ok(tuner.getSupportedSourceTypes().length > 0,
"Tuner " + i + " should have supported source type(s).");
ok(!tuner.currentSource,
"Tuner " + i + " should have no current source by default.");
ok(!tuner.stream, "Tuner " + i + " should have no stream by default.");
}
finish();
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

9
dom/tv/test/file_tv_non_permitted_app.html → dom/tv/test/mochitest/file_tv_non_permitted_app.html
Просмотреть файл

@ -6,16 +6,9 @@
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
function ok(a, msg) {
alert((a ? 'OK' : 'KO')+ ' ' + msg)
}
function finish() {
alert('DONE');
}
ok(!('tv' in navigator),
"navigator.tv should not exist for non-permitted app.");
finish();

16
dom/tv/test/mochitest/file_tv_permitted_app.html Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test the availability of TV Manager API for permitted Apps</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist for permitted app.");
finish();
</script>
</body>
</html>

68
dom/tv/test/mochitest/file_tv_scan_channels_completed.html Normal file
Просмотреть файл

@ -0,0 +1,68 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test channel scanning complete for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
var isScannedEventFired = false;
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
var source = aSources[0];
source.oneitbroadcasted = function(aEvent) {
info("Received EIT broadcasted event.");
var programs = aEvent.programs;
for (var i = 0; i < programs.length; i++) {
ok(programs[i], "Program " + i + " should be set.")
}
};
source.onscanningstatechanged = function(aEvent) {
if (aEvent.state === 'scanned') {
isScannedEventFired = true;
info("Received channel scanned event.");
ok(aEvent.channel, "Scanned channel should be set.");
} else if (aEvent.state === 'completed') {
ok(isScannedEventFired, "Received channel scanning completed event after channel scanned event.");
finish();
}
};
// TODO Bug 1088818 - Modify the behavior of channel scanning.
source.startScanning({}).then(
function() {},
function(aError) {
ok(false, "Error occurred when starting scanning: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

66
dom/tv/test/mochitest/file_tv_scan_channels_stopped.html Normal file
Просмотреть файл

@ -0,0 +1,66 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test StartScanning and StopScanning for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
var isClearedEventFired = false;
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
var source = aSources[0];
source.onscanningstatechanged = function(aEvent) {
if (aEvent.state === 'cleared') {
isClearedEventFired = true;
info("Received channel cache cleared event.");
} else if (aEvent.state === 'stopped') {
ok(isClearedEventFired, "Received channel scanning stopped event after cleared event.");
finish();
}
};
// TODO Bug 1088818 - Modify the behavior of channel scanning.
source.startScanning({ isRescanned: true }).then(
function() {
source.stopScanning().then(
function() {},
function(aError) {
ok(false, "Error occurred when stopping scanning: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when starting scanning: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

70
dom/tv/test/mochitest/file_tv_set_current_channel.html Normal file
Просмотреть файл

@ -0,0 +1,70 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test SetCurrentChannel for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
var tuner = aTuners[0];
var selectedSourceType = tuner.getSupportedSourceTypes()[0];
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
var source = aSources[0];
source.getChannels().then(
function(aChannels) {
ok(aChannels.length > 0, "Got at least 1 channel.");
var selectedChannelNumber = aChannels[0].number;
source.oncurrentchannelchanged = function(aEvent) {
ok(aEvent instanceof TVCurrentChannelChangedEvent,
"The event is in the right type");
ok(aEvent.channel instanceof TVChannel,
"The channel is in the right type.");
is(aEvent.channel, source.currentChannel,
"The current channel is set.");
is(source.currentChannel.number, selectedChannelNumber,
"The current channel number is correct.");
finish();
};
source.setCurrentChannel(selectedChannelNumber).then(
function() {},
function(aError) {
ok(false, "Error occurred when setting current channel: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting channels: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

58
dom/tv/test/mochitest/file_tv_set_current_channel_during_scanning.html Normal file
Просмотреть файл

@ -0,0 +1,58 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test an error case for SetCurrentChannel during scanning for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners){
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
var source = aSources[0];
// TODO Bug 1088818 - Modify the behavior of channel scanning.
source.startScanning({}).then(
function() {
source.setCurrentChannel("1").then(
function() {
ok(false, "Setting current channel during scanning should get error.");
finish();
},
function(aError) {
is(aError.name, "InvalidStateError",
"InvalidStateError should be expected.");
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when starting scanning: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

48
dom/tv/test/mochitest/file_tv_set_current_source.html Normal file
Просмотреть файл

@ -0,0 +1,48 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test SetCurrentSource for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
var tuner = aTuners[0];
var selectedSourceType = tuner.getSupportedSourceTypes()[0];
tuner.oncurrentsourcechanged = function(aEvent) {
ok(aEvent instanceof TVCurrentSourceChangedEvent,
"The event is in the right type");
ok(aEvent.source instanceof TVSource,
"The source is in the right type.");
is(aEvent.source, tuner.currentSource,
"The current source is set.");
is(tuner.currentSource.type, selectedSourceType,
"The current source type is correct.");
finish();
};
tuner.setCurrentSource(selectedSourceType).then(
function() {},
function(aError) {
ok(false, "Error occurred when setting current source: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

49
dom/tv/test/mochitest/file_tv_set_invalid_current_channel.html Normal file
Просмотреть файл

@ -0,0 +1,49 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test an error case for SetCurrentChannel for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
var tuner = aTuners[0];
var selectedSourceType = tuner.getSupportedSourceTypes()[0];
aTuners[0].getSources().then(
function(aSources) {
ok(aSources.length > 0, "Got at least 1 source.");
aSources[0].setCurrentChannel("NonExistentChannelNumber").then(
function() {
ok(false, "Setting an invalid current channel should get error.");
finish();
},
function(aError) {
is(aError.name, "AbortError", "AbortError should be expected.");
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting sources: " + aError);
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

36
dom/tv/test/mochitest/file_tv_set_invalid_current_source.html Normal file
Просмотреть файл

@ -0,0 +1,36 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test an error case for SetCurrentSource for TV API</title>
</head>
<body>
<div id="content"></div>
<script type="application/javascript" src="./test_helpers.js"></script>
<script type="application/javascript;version=1.7">
ok('tv' in navigator, "navigator.tv should exist.");
navigator.tv.getTuners().then(
function(aTuners) {
ok(aTuners.length > 0, "Got at least 1 tuner.");
aTuners[0].setCurrentSource("InvalidSourceType").then(
function() {
ok(false, "Setting an invalid current source should get error.");
finish();
},
function(aError) {
is(aError.name, "TypeError", "TypeError should be expected.");
finish();
}
);
},
function(aError) {
ok(false, "Error occurred when getting tuners: " + aError);
finish();
}
);
</script>
</body>
</html>

97
dom/tv/test/mochitest/head.js Normal file
Просмотреть файл

@ -0,0 +1,97 @@
"use strict";
var gAppsService = SpecialPowers.Cc["@mozilla.org/AppsService;1"]
.getService(SpecialPowers.Ci.nsIAppsService);
var gApp;
function cbError(e) {
ok(false, "Error callback invoked: " + this.error.name);
SimpleTest.finish();
}
function installApp(aTestToken, aTemplate) {
var hostedManifestURL = window.location.origin +
'/tests/dom/tv/test/mochitest/file_app.sjs?testToken='
+ aTestToken + '&template=' + aTemplate;
var request = navigator.mozApps.install(hostedManifestURL);
request.onerror = cbError;
request.onsuccess = function() {
gApp = request.result;
var appId = gAppsService.getAppLocalIdByManifestURL(gApp.manifestURL);
SpecialPowers.addPermission("tv", true, { url: gApp.origin,
appId: appId,
isInBrowserElement: false });
runTest();
}
}
function uninstallApp() {
var request = navigator.mozApps.mgmt.uninstall(gApp);
request.onerror = cbError;
request.onsuccess = function() {
// All done.
info("All done");
runTest();
}
}
function testApp() {
var ifr = document.createElement('iframe');
ifr.setAttribute('mozbrowser', 'true');
ifr.setAttribute('mozapp', gApp.manifestURL);
ifr.setAttribute('src', gApp.manifest.launch_path);
var domParent = document.getElementById('content');
// Set us up to listen for messages from the app.
var listener = function(e) {
var message = e.detail.message;
if (/^OK/.exec(message)) {
ok(true, "Message from app: " + message);
} else if (/KO/.exec(message)) {
ok(false, "Message from app: " + message);
} else if (/^INFO/.exec(message)) {
info("Message from app: " + message);
} else if (/DONE/.exec(message)) {
ok(true, "Messaging from app complete");
ifr.removeEventListener('mozbrowsershowmodalprompt', listener);
domParent.removeChild(ifr);
runTest();
}
}
// This event is triggered when the app calls "alert".
ifr.addEventListener('mozbrowsershowmodalprompt', listener, false);
domParent.appendChild(ifr);
}
function runTest() {
if (!tests.length) {
SimpleTest.finish();
return;
}
var test = tests.shift();
test();
}
function setupPrefsAndPermissions() {
SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true],
["dom.testing.tv_enabled_for_hosted_apps", true]]}, function() {
SpecialPowers.pushPermissions(
[{ "type": "browser", "allow": true, "context": document },
{ "type": "embed-apps", "allow": true, "context": document },
{ "type": "webapps-manage", "allow": true, "context": document }],
function() {
SpecialPowers.setAllAppsLaunchable(true);
SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
// No confirmation needed when an app is installed and uninstalled.
SpecialPowers.autoConfirmAppInstall(() => {
SpecialPowers.autoConfirmAppUninstall(runTest);
});
});
});
}

37
dom/tv/test/mochitest/mochitest.ini Normal file
Просмотреть файл

@ -0,0 +1,37 @@
[DEFAULT]
support-files =
file_app.sjs
file_app.template.webapp
file_tv_non_permitted_app.html
file_tv_permitted_app.html
file_tv_get_tuners.html
file_tv_get_sources.html
file_tv_get_channels.html
file_tv_get_channels_during_scanning.html
file_tv_get_programs.html
file_tv_get_current_program.html
file_tv_set_current_source.html
file_tv_set_invalid_current_source.html
file_tv_set_current_channel.html
file_tv_set_current_channel_during_scanning.html
file_tv_set_invalid_current_channel.html
file_tv_scan_channels_stopped.html
file_tv_scan_channels_completed.html
head.js
test_helpers.js
[test_tv_non_permitted_app.html]
[test_tv_permitted_app.html]
[test_tv_get_tuners.html]
[test_tv_get_sources.html]
[test_tv_get_channels.html]
[test_tv_get_channels_during_scanning.html]
[test_tv_get_programs.html]
[test_tv_get_current_program.html]
[test_tv_set_current_source.html]
[test_tv_set_invalid_current_source.html]
[test_tv_set_current_channel.html]
[test_tv_set_current_channel_during_scanning.html]
[test_tv_set_invalid_current_channel.html]
[test_tv_scan_channels_stopped.html]
[test_tv_scan_channels_completed.html]

17
dom/tv/test/mochitest/test_helpers.js Normal file
Просмотреть файл

@ -0,0 +1,17 @@
"use strict";
function is(a, b, msg) {
alert((a === b ? 'OK' : 'KO') + ' ' + msg);
}
function ok(a, msg) {
alert((a ? 'OK' : 'KO')+ ' ' + msg);
}
function info(msg) {
alert('INFO ' + msg);
}
function finish() {
alert('DONE');
}

35
dom/tv/test/mochitest/test_tv_get_channels.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test GetChannels for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_get_channels.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test an error case for GetChannels during scanning for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_get_channels_during_scanning.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_get_current_program.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test GetCurrentProgram for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_get_current_program.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_get_programs.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test GetPrograms for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_get_programs.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

37
dom/tv/test/mochitest/test_tv_get_sources.html Normal file
Просмотреть файл

@ -0,0 +1,37 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test GetSources for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
"use strict";
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_get_sources.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_get_tuners.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test GetTuners for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_get_tuners.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

49
dom/tv/test/mochitest/test_tv_non_permitted_app.html Normal file
Просмотреть файл

@ -0,0 +1,49 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test Non-Permitted Application for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
function() {
SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true]]}, function() {
SpecialPowers.pushPermissions(
[{ "type": "browser", "allow": true, "context": document },
{ "type": "embed-apps", "allow": true, "context": document },
{ "type": "webapps-manage", "allow": true, "context": document }],
function() {
SpecialPowers.setAllAppsLaunchable(true);
SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
// No confirmation needed when an app is installed and uninstalled.
SpecialPowers.autoConfirmAppInstall(() => {
SpecialPowers.autoConfirmAppUninstall(runTest);
});
});
});
},
// Installing the app
installApp.bind(this, "file_tv_non_permitted_app.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_permitted_app.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test Permitted Application for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_permitted_app.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

36
dom/tv/test/mochitest/test_tv_scan_channels_completed.html Normal file
Просмотреть файл

@ -0,0 +1,36 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test channel scanning complete for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_scan_channels_completed.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.expectAssertions(0, 2);
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_scan_channels_stopped.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test StartScanning and StopScanning for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_scan_channels_stopped.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_set_current_channel.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test SetCurrentChannel for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_set_current_channel.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test an error case for SetCurrentChannel during scanning for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_set_current_channel_during_scanning.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_set_current_source.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test SetCurrentSource for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_set_current_source.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test an error case for SetCurrentChannel for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_set_invalid_current_channel.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

35
dom/tv/test/mochitest/test_tv_set_invalid_current_source.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test an error case for SetCurrentSource for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript" src="./head.js"></script>
<script type="application/javascript">
var tests = [
// Setup preferences and permissions
setupPrefsAndPermissions,
// Installing the app
installApp.bind(this, "file_tv_set_invalid_current_source.html", "file_app.template.webapp"),
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</pre>
</body>
</html>

7
dom/tv/test/moz.build
Просмотреть файл

@ -1,7 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; 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/.
MOCHITEST_MANIFESTS += ['mochitest.ini']

112
dom/tv/test/test_tv_non_permitted_app.html
Просмотреть файл

@ -1,112 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test Non-Permitted Application for TV API</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="application/javascript">
"use strict";
var gHostedManifestURL = 'http://test/tests/dom/tv/test/file_app.sjs?testToken=file_tv_non_permitted_app.html&template=file_app.template.webapp';
var gApp;
function cbError(e) {
ok(false, "Error callback invoked: " + this.error.name);
SimpleTest.finish();
}
function installApp() {
var request = navigator.mozApps.install(gHostedManifestURL);
request.onerror = cbError;
request.onsuccess = function() {
gApp = request.result;
runTest();
}
}
function uninstallApp() {
var request = navigator.mozApps.mgmt.uninstall(gApp);
request.onerror = cbError;
request.onsuccess = function() {
// All done.
info("All done");
runTest();
}
}
function testApp() {
var ifr = document.createElement('iframe');
ifr.setAttribute('mozbrowser', 'true');
ifr.setAttribute('mozapp', gApp.manifestURL);
ifr.setAttribute('src', gApp.manifest.launch_path);
var domParent = document.getElementById('content');
// Set us up to listen for messages from the app.
var listener = function(e) {
var message = e.detail.message;
if (/^OK/.exec(message)) {
ok(true, "Message from app: " + message);
} else if (/KO/.exec(message)) {
ok(false, "Message from app: " + message);
} else if (/DONE/.exec(message)) {
ok(true, "Messaging from app complete");
ifr.removeEventListener('mozbrowsershowmodalprompt', listener);
domParent.removeChild(ifr);
runTest();
}
}
// This event is triggered when the app calls "alert".
ifr.addEventListener('mozbrowsershowmodalprompt', listener, false);
domParent.appendChild(ifr);
}
var tests = [
// Installing the app
installApp,
// Run tests in app
testApp,
// Uninstall the app
uninstallApp
];
function runTest() {
if (!tests.length) {
SimpleTest.finish();
return;
}
var test = tests.shift();
test();
}
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true]]}, function() {
SpecialPowers.pushPermissions(
[{ "type": "tv", "allow": true, "context": document },
{ "type": "browser", "allow": true, "context": document },
{ "type": "embed-apps", "allow": true, "context": document },
{ "type": "webapps-manage", "allow": true, "context": document }],
function(){
SpecialPowers.setAllAppsLaunchable(true);
SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
// No confirmation needed when an app is installed
SpecialPowers.autoConfirmAppInstall(() => {
SpecialPowers.autoConfirmAppUninstall(runTest);
});
});
});
</script>
</pre>
</body>
</html>

169
dom/tv/test/xpcshell/test_tv_channel_data.js Normal file
Просмотреть файл

@ -0,0 +1,169 @@
"use strict";
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
function run_test() {
run_next_test();
}
add_test(function test_valid_network_id() {
var networkId = "networkId";
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.networkId = networkId;
equal(data.networkId, networkId);
run_next_test();
});
add_test(function test_empty_network_id() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.networkId = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_transport_stream_id() {
var transportStreamId = "transportStreamId";
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.transportStreamId = transportStreamId;
equal(data.transportStreamId, transportStreamId);
run_next_test();
});
add_test(function test_empty_transport_stream_id() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.transportStreamId = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_service_id() {
var serviceId = "serviceId";
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.serviceId = serviceId;
equal(data.serviceId, serviceId);
run_next_test();
});
add_test(function test_empty_service_id() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.serviceId = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_type() {
var type = "tv";
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.type = type;
equal(data.type, type);
run_next_test();
});
add_test(function test_empty_type() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.type = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_invalid_type() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.type = "invalid";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_number() {
var number = "number";
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.number = number;
equal(data.number, number);
run_next_test();
});
add_test(function test_empty_number() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.number = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_name() {
var name = "name";
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.name = name;
equal(data.name, name);
run_next_test();
});
add_test(function test_empty_name() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
Assert.throws(function() {
data.name = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_is_emergency() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.isEmergency = true;
ok(data.isEmergency);
run_next_test();
});
add_test(function test_is_free() {
var data = Cc["@mozilla.org/tv/tvchanneldata;1"].
createInstance(Ci.nsITVChannelData);
data.isFree = true;
ok(data.isFree);
run_next_test();
});

197
dom/tv/test/xpcshell/test_tv_program_data.js Normal file
Просмотреть файл

@ -0,0 +1,197 @@
"use strict";
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
function run_test() {
run_next_test();
}
add_test(function test_valid_event_id() {
var eventId = "eventId";
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.eventId = eventId;
equal(data.eventId, eventId);
run_next_test();
});
add_test(function test_empty_event_id() {
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
Assert.throws(function() {
data.eventId = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_title() {
var title = "title";
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.title = title;
equal(data.title, title);
run_next_test();
});
add_test(function test_empty_title() {
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
Assert.throws(function() {
data.title = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_start_time() {
var startTime = 1;
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.startTime = startTime;
equal(data.startTime, startTime);
run_next_test();
});
add_test(function test_duration() {
var duration = 1;
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.duration = duration;
equal(data.duration, duration);
run_next_test();
});
add_test(function test_valid_description() {
var description = "description";
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.description = description;
equal(data.description, description);
run_next_test();
});
add_test(function test_empty_description() {
var description = "";
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.description = description;
equal(data.description, description);
run_next_test();
});
add_test(function test_valid_rating() {
var rating = "rating";
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.rating = rating;
equal(data.rating, rating);
run_next_test();
});
add_test(function test_empty_rating() {
var rating = "";
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.rating = rating;
equal(data.rating, rating);
run_next_test();
});
add_test(function test_valid_audio_languages() {
var languages = ["eng", "jpn"];
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.setAudioLanguages(languages.length, languages);
var audioLanguages = data.getAudioLanguages();
equal(audioLanguages.length, languages.length);
for (var i = 0; i < audioLanguages.length; i++) {
equal(audioLanguages[i], languages[i]);
}
run_next_test();
});
add_test(function test_empty_audio_languages() {
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.setAudioLanguages(0, []);
var audioLanguages = data.getAudioLanguages();
equal(audioLanguages.length, 0);
run_next_test();
});
add_test(function test_mismatched_audio_languages() {
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
Assert.throws(function() {
data.setAudioLanguages(1, []);
}, /NS_ERROR_XPC_NOT_ENOUGH_ELEMENTS_IN_ARRAY/i);
run_next_test();
});
add_test(function test_valid_subtitle_languages() {
var languages = ["eng", "jpn"];
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.setSubtitleLanguages(languages.length, languages);
var subtitleLanguages = data.getSubtitleLanguages();
equal(subtitleLanguages.length, languages.length);
for (var i = 0; i < subtitleLanguages.length; i++) {
equal(subtitleLanguages[i], languages[i]);
}
run_next_test();
});
add_test(function test_empty_subtitle_languages() {
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
data.setSubtitleLanguages(0, []);
var subtitleLanguages = data.getSubtitleLanguages();
equal(subtitleLanguages.length, 0);
run_next_test();
});
add_test(function test_mismatched_subtitle_languages() {
var data = Cc["@mozilla.org/tv/tvprogramdata;1"].
createInstance(Ci.nsITVProgramData);
Assert.throws(function() {
data.setSubtitleLanguages(1, []);
}, /NS_ERROR_XPC_NOT_ENOUGH_ELEMENTS_IN_ARRAY/i);
run_next_test();
});

65
dom/tv/test/xpcshell/test_tv_tuner_data.js Normal file
Просмотреть файл

@ -0,0 +1,65 @@
"use strict";
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
function run_test() {
run_next_test();
}
add_test(function test_valid_id() {
var id = "id";
var data = Cc["@mozilla.org/tv/tvtunerdata;1"].
createInstance(Ci.nsITVTunerData);
data.id = id;
equal(data.id, id);
run_next_test();
});
add_test(function test_empty_id() {
var data = Cc["@mozilla.org/tv/tvtunerdata;1"].
createInstance(Ci.nsITVTunerData);
Assert.throws(function() {
data.id = "";
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_valid_supported_source_types() {
var sourceTypes = ["dvb-t", "dvb-s"];
var data = Cc["@mozilla.org/tv/tvtunerdata;1"].
createInstance(Ci.nsITVTunerData);
data.setSupportedSourceTypes(sourceTypes.length, sourceTypes);
var types = data.getSupportedSourceTypes();
equal(types.length, sourceTypes.length);
for (var i = 0; i < types.length; i++) {
equal(types[i], sourceTypes[i]);
}
run_next_test();
});
add_test(function test_empty_supported_source_types() {
var data = Cc["@mozilla.org/tv/tvtunerdata;1"].
createInstance(Ci.nsITVTunerData);
Assert.throws(function() {
data.setSupportedSourceTypes(0, []);
}, /NS_ERROR_ILLEGAL_VALUE/i);
run_next_test();
});
add_test(function test_mismatched_supported_source_types() {
var data = Cc["@mozilla.org/tv/tvtunerdata;1"].
createInstance(Ci.nsITVTunerData);
Assert.throws(function() {
data.setSupportedSourceTypes(1, []);
}, /NS_ERROR_XPC_NOT_ENOUGH_ELEMENTS_IN_ARRAY/i);
run_next_test();
});

7
dom/tv/test/xpcshell/xpcshell.ini Normal file
Просмотреть файл

@ -0,0 +1,7 @@
[DEFAULT]
head =
tail =
[test_tv_tuner_data.js]
[test_tv_channel_data.js]
[test_tv_program_data.js]

3
dom/webidl/IccCardLockError.webidl
Просмотреть файл

@ -3,9 +3,8 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
[Constructor(DOMString lockType, DOMString errorName, short retryCount),
[Constructor(DOMString errorName, short retryCount),
Pref="dom.icc.enabled"]
interface IccCardLockError : DOMError {
readonly attribute DOMString lockType;
readonly attribute short retryCount;
};

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше