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

Bug 1644905 - Make the display sharing container a group, and set aria-labelledby when updating the displayed label. r=pbz 

Differential Revision: https://phabricator.services.mozilla.com/D79357
This commit is contained in:
Mike Conley 2020-06-16 11:20:57 +00:00
Родитель 542d54d4f7
Коммит c8fca8ef8c
2 изменённых файлов: 29 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

31
browser/base/content/webrtcIndicator.js
Просмотреть файл

@ -89,10 +89,11 @@ const WebRTCIndicator = {
this.updateWindowAttr("sharingvideo", webrtcUI.showCameraIndicator);
this.updateWindowAttr("sharingaudio", webrtcUI.showMicrophoneIndicator);
this.updateWindowAttr(
"sharingscreen",
webrtcUI.showScreenSharingIndicator.startsWith("Screen")
let sharingScreen = webrtcUI.showScreenSharingIndicator.startsWith(
"Screen"
);
this.updateWindowAttr("sharingscreen", sharingScreen);
// We don't currently support the browser-tab sharing case, so we don't
// check if the screen sharing indicator starts with "Browser".
@ -124,6 +125,30 @@ const WebRTCIndicator = {
this.sharingBrowserWindow = false;
}
// The label that's displayed when sharing a display followed a priority.
// The more "risky" we deem the display is for sharing, the higher priority.
// This gives us the following priorities, from highest to lowest.
//
// 1. Screen
// 2. Browser window
// 3. Other application window
// 4. Browser tab (unimplemented)
//
// The CSS for the indicator does the work of showing or hiding these labels
// for us, but we need to update the aria-labelledby attribute on the container
// of those labels to make it clearer for screenreaders which one the user cares
// about.
let displayShare = document.getElementById("display-share");
let labelledBy;
if (sharingScreen) {
labelledBy = "screen-share-info";
} else if (this.sharingBrowserWindow) {
labelledBy = "browser-window-share-info";
} else if (sharingWindow) {
labelledBy = "window-share-info";
}
displayShare.setAttribute("aria-labelledby", labelledBy);
// Resize and ensure the window position is correct
// (sizeToContent messes with our position).
window.sizeToContent();

2
browser/base/content/webrtcIndicator.xhtml
Просмотреть файл

@ -23,7 +23,7 @@
<body role="alert">
<div id="drag-indicator" />
<div id="display-share" class="row-item">
<div id="display-share" class="row-item" role="group" aria-labelledby="">
<image id="display-share-icon" />
<span id="window-share-info" data-l10n-id="webrtc-sharing-window"/>