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

Bug 1580506, fix incorrect pointerlock message names, r=Gijs 

Differential Revision: https://phabricator.services.mozilla.com/D45577

MANUAL PUSH: re-push with eslint bustage fix

--HG--
extra : rebase_source : 88e90063f4ae11170c7151f21deabe6675971323
extra : amend_source : 5895721851fe48ce4f57f6f33838b5b1885fee3b
extra : source : f779d14e3ab8bb8b31a29601e9391775babbc2da
This commit is contained in:
Neil Deakin 2019-09-12 12:08:41 +00:00
Родитель b6461aa946
Коммит c3bcfee4c1
3 изменённых файлов: 85 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/actors/BrowserTabParent.jsm
Просмотреть файл

@ -43,12 +43,12 @@ class BrowserTabParent extends JSWindowActorParent {
break;
}
case "MozDOMPointerLock:Entered": {
case "PointerLock:Entered": {
browser.ownerGlobal.PointerLock.entered(message.data.originNoSuffix);
break;
}
case "MozDOMPointerLock:Exited":
case "PointerLock:Exited":
browser.ownerGlobal.PointerLock.exited();
break;
}

1
dom/tests/browser/browser.ini
Просмотреть файл

@ -77,6 +77,7 @@ skip-if = fission
support-files =
test_mixed_content_image.html
dummy.png
[browser_pointerlock_warning.js]
[browser_test_focus_after_modal_state.js]
skip-if = verify
support-files =

82
dom/tests/browser/browser_pointerlock_warning.js Normal file
Просмотреть файл

@ -0,0 +1,82 @@
/**
* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
const TEST_URL =
"data:text/html,<body onpointerdown='this.requestPointerLock()' style='width: 100px; height: 100px;'></body>";
// Make sure the pointerlock warning is shown and exited with the escape key
add_task(async function show_pointerlock_warning_escape() {
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
let warning = document.getElementById("pointerlock-warning");
let warningShownPromise = BrowserTestUtils.waitForAttribute(
"onscreen",
warning,
"true"
);
await BrowserTestUtils.synthesizeMouse("body", 4, 4, {}, tab.linkedBrowser);
await warningShownPromise;
ok(true, "Pointerlock warning shown");
let warningHiddenPromise = BrowserTestUtils.waitForAttribute(
"hidden",
warning,
"true"
);
EventUtils.synthesizeKey("KEY_Escape");
await warningHiddenPromise;
ok(true, "Pointerlock warning hidden");
// Pointerlock should be released after escape is pressed.
await ContentTask.spawn(tab.linkedBrowser, null, async function() {
Assert.equal(content.document.pointerLockElement, null);
});
await BrowserTestUtils.removeTab(tab);
});
// Make sure the pointerlock warning is shown, but this time escape is not pressed until after the
// notification is closed via the timeout.
add_task(async function show_pointerlock_warning_timeout() {
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
let warning = document.getElementById("pointerlock-warning");
let warningShownPromise = BrowserTestUtils.waitForAttribute(
"onscreen",
warning,
"true"
);
let warningHiddenPromise = BrowserTestUtils.waitForAttribute(
"hidden",
warning,
"true"
);
await BrowserTestUtils.synthesizeMouse("body", 4, 4, {}, tab.linkedBrowser);
await warningShownPromise;
ok(true, "Pointerlock warning shown");
await warningHiddenPromise;
// The warning closes after a few seconds, but this does not exit pointerlock mode.
await ContentTask.spawn(tab.linkedBrowser, null, async function() {
Assert.equal(content.document.pointerLockElement, content.document.body);
});
EventUtils.synthesizeKey("KEY_Escape");
ok(true, "Pointerlock warning hidden");
// Pointerlock should now be released.
await ContentTask.spawn(tab.linkedBrowser, null, async function() {
Assert.equal(content.document.pointerLockElement, null);
});
await BrowserTestUtils.removeTab(tab);
});