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

Merge m-c to fx-team, a=merge

This commit is contained in:
Wes Kocher 2016-05-24 11:40:34 -07:00
Родитель 1bcaca5643 f6aab6a144
Коммит 690d2128a5
4 изменённых файлов: 12 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
testing/mochitest/server.js
Просмотреть файл

@ -712,7 +712,7 @@ function testListing(metadata, response)
),
DIV({class: "clear"}),
DIV({class: "frameholder"},
IFRAME({scrolling: "no", id: "testframe", "allowfullscreen": true})
IFRAME({scrolling: "no", id: "testframe"})
),
DIV({class: "clear"}),
DIV({class: "toggle"},

3
toolkit/content/tests/widgets/chrome.ini
Просмотреть файл

@ -4,6 +4,7 @@ support-files =
tree_shared.js
popup_shared.js
window_menubar.xul
seek_with_sound.ogg
[test_contextmenu_nested.xul]
skip-if = os == 'linux' # Bug 1116215
@ -18,4 +19,6 @@ skip-if = os == 'android'
[test_tree_column_reorder.xul]
skip-if = toolkit == 'android'
[test_videocontrols.html]
skip-if = toolkit == 'android'
[test_videocontrols.html]
[test_videocontrols_onclickplay.html]

2
toolkit/content/tests/widgets/mochitest.ini
Просмотреть файл

@ -24,8 +24,6 @@ support-files =
[test_audiocontrols_dimensions.html]
skip-if = toolkit == 'android'
[test_mousecapture_area.html]
[test_videocontrols.html]
tags = fullscreen
skip-if = toolkit == 'android' #TIMED_OUT
[test_videocontrols_audio.html]
[test_videocontrols_audio_direction.html]

18
toolkit/content/tests/widgets/test_videocontrols.html
Просмотреть файл

@ -2,9 +2,9 @@
<html>
<head>
<title>Video controls test</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
</head>
<body>
<p id="display"></p>
@ -29,8 +29,8 @@ const playButtonHeight = 28;
const muteButtonWidth = 33;
const muteButtonHeight = 28;
const durationWidth = 34;
const fullscreenButtonWidth = 28;
const fullscreenButtonHeight = 28;
const fullscreenButtonWidth = document.fullscreenEnabled ? 28 : 0;
const fullscreenButtonHeight = document.fullscreenEnabled ? 28 : 0;
const volumeSliderWidth = 32;
const scrubberWidth = videoWidth - playButtonWidth - durationWidth - muteButtonWidth - volumeSliderWidth - fullscreenButtonWidth;
const scrubberHeight = 28;
@ -52,14 +52,12 @@ const scrubberCenterY = videoHeight - Math.round(scrubberHeight / 2);
var testnum = 1;
var video = document.getElementById("video");
const domUtil = SpecialPowers.Cc["@mozilla.org/inspector/dom-utils;1"]
.getService(SpecialPowers.Ci.inIDOMUtils);
function getButtonByAttribute(aName, aValue) {
var domUtil = Components.classes["@mozilla.org/inspector/dom-utils;1"]
.getService(Components.interfaces.inIDOMUtils);
var kids = domUtil.getChildrenForNode(video, true);
var videocontrols = kids[1];
return SpecialPowers.wrap(document)
.getAnonymousElementByAttribute(videocontrols, aName, aValue);
return document.getAnonymousElementByAttribute(videocontrols, aName, aValue);
}
function isMuteButtonMuted() {