Diff
Modified: trunk/LayoutTests/ChangeLog (211985 => 211986)
--- trunk/LayoutTests/ChangeLog 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/ChangeLog 2017-02-09 21:31:35 UTC (rev 211986)
@@ -1,5 +1,19 @@
2017-02-09 Ryan Haddad <[email protected]>
+ Unreviewed, rolling out r211802.
+
+ This change caused fast/regions/inline-block-inside-anonymous-
+ overflow-with-covered-controls.html to be a flaky failure.
+
+ Reverted changeset:
+
+ "[Modern Media Controls] Improve handling of <video> with only
+ audio tracks"
+ https://bugs.webkit.org/show_bug.cgi?id=167836
+ http://trac.webkit.org/changeset/211802
+
+2017-02-09 Ryan Haddad <[email protected]>
+
Mark http/tests/media/track-in-band-hls-metadata-crash.html as a flaky timeout.
https://bugs.webkit.org/show_bug.cgi?id=167749
Modified: trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls-expected.html (211985 => 211986)
--- trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls-expected.html 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls-expected.html 2017-02-09 21:31:35 UTC (rev 211986)
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=false ] -->
+<!DOCTYPE html>
<html>
<head>
<style>
@@ -44,7 +44,7 @@
<p>This test passes if the <span style="color:#00BB00">green text</span> is positioned at the very top of the second <span style="color:blue">region</span> and the <span style="color:blue">blue text</span> immediately after it.</p>
<div class="region" id="region1">
<div class="article" id="article1">
- <video id="video" src="" controls></video><span style="color:#00FF00">
+ <video id="video" controls></video><span style="color:#00FF00">
</div>
</div>
Modified: trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls.html (211985 => 211986)
--- trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls.html 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls.html 2017-02-09 21:31:35 UTC (rev 211986)
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=false ] -->
+<!DOCTYPE html>
<html>
<head>
<style>
@@ -44,7 +44,7 @@
<div class="region" id="region1"></div>
<div class="region" id="region2"></div>
<div id="article">
- <video id="video" src="" controls></video><span style="color:#00FF00">This text, together with the video element, are inside an anonymouse block</span>
+ <video id="video" controls></video><span style="color:#00FF00">This text, together with the video element, are inside an anonymouse block</span>
<div id="after" style="color:blue">This div is after the anonymous block</div>
</div>
<div id="controlsBlocker"></div>
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt 2017-02-09 21:31:35 UTC (rev 211986)
@@ -3,9 +3,11 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
Media has loaded metadata
-PASS media.videoTracks.length is 1
PASS mediaController.controls.controlsBar.visible is true
PASS mediaController.controls.startButton.visible is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html 2017-02-09 21:31:35 UTC (rev 211986)
@@ -13,10 +13,13 @@
const media = document.querySelector("video");
const mediaController = createControls(shadowRoot, media, null);
+debug("Media has not begun loading yet");
+shouldBeFalse("mediaController.controls.controlsBar.visible");
+shouldBeFalse("mediaController.controls.startButton.visible");
+
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBe("media.videoTracks.length", "1");
shouldBeTrue("mediaController.controls.controlsBar.visible");
shouldBeTrue("mediaController.controls.startButton.visible");
debug("");
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt 2017-02-09 21:31:35 UTC (rev 211986)
@@ -3,9 +3,11 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
Media has loaded metadata
-PASS media.videoTracks.length is 1
PASS mediaController.controls.controlsBar.visible is true
PASS mediaController.controls.startButton.visible is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html 2017-02-09 21:31:35 UTC (rev 211986)
@@ -35,10 +35,13 @@
}
}).observe(media, { attributes: true, attributeFilter: ["controls"] });
+debug("Media has not begun loading yet");
+shouldBeFalse("mediaController.controls.controlsBar.visible");
+shouldBeFalse("mediaController.controls.startButton.visible");
+
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBe("media.videoTracks.length", "1");
shouldBeTrue("mediaController.controls.controlsBar.visible");
shouldBeTrue("mediaController.controls.startButton.visible");
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt 2017-02-09 21:31:35 UTC (rev 211986)
@@ -1,12 +0,0 @@
-Testing that we only show appropriate controls for a video element with only audio tracks.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS mediaControls.querySelector('button.fullscreen') is null
-PASS mediaControls.querySelector('.controls-bar').classList.contains('faded') is false
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html 2017-02-09 21:31:35 UTC (rev 211986)
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<body>
-<video src="" style="width: 800px; height: 240px;" controls autoplay data-auto-hide-delay="100"></video>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing that we only show appropriate controls for a video element with only audio tracks.");
-
-const media = document.querySelector("video");
-const shadowRoot = window.internals.shadowRoot(media);
-let mediaControls;
-
-media.addEventListener("play", event => {
- mediaControls = shadowRoot.lastElementChild.lastElementChild;
-
- // We should not show the fullscreen button if we have a <video> with no audio tracks.
- window.requestAnimationFrame(() => shouldBeNull("mediaControls.querySelector('button.fullscreen')"));
-
- setTimeout(() => {
- // Controls should not auto-hide if we have a <video> with no audio tracks.
- shouldBeFalse("mediaControls.querySelector('.controls-bar').classList.contains('faded')");
-
- debug("");
- media.remove();
- finishJSTest();
- }, 250);
-});
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/media/modern-media-controls/time-label/time-label-white-space-nowrap.html (211985 => 211986)
--- trunk/LayoutTests/media/modern-media-controls/time-label/time-label-white-space-nowrap.html 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/LayoutTests/media/modern-media-controls/time-label/time-label-white-space-nowrap.html 2017-02-09 21:31:35 UTC (rev 211986)
@@ -14,14 +14,12 @@
const media = event.target;
media.pause();
- window.requestAnimationFrame(() => {
- timeLabel = window.internals.shadowRoot(media).querySelector(".time-label");
- shouldBeEqualToString("timeLabel.ownerDocument.defaultView.getComputedStyle(timeLabel).whiteSpace", "nowrap");
+ timeLabel = window.internals.shadowRoot(media).querySelector(".time-label");
+ shouldBeEqualToString("timeLabel.ownerDocument.defaultView.getComputedStyle(timeLabel).whiteSpace", "nowrap");
- debug("");
- media.remove();
- finishJSTest();
- });
+ debug("");
+ media.remove();
+ finishJSTest();
});
</script>
Modified: trunk/Source/WebCore/ChangeLog (211985 => 211986)
--- trunk/Source/WebCore/ChangeLog 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 21:31:35 UTC (rev 211986)
@@ -1,3 +1,17 @@
+2017-02-09 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r211802.
+
+ This change caused fast/regions/inline-block-inside-anonymous-
+ overflow-with-covered-controls.html to be a flaky failure.
+
+ Reverted changeset:
+
+ "[Modern Media Controls] Improve handling of <video> with only
+ audio tracks"
+ https://bugs.webkit.org/show_bug.cgi?id=167836
+ http://trac.webkit.org/changeset/211802
+
2017-02-09 Alex Christensen <[email protected]>
Fix i386 libwebrtc build
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js (211985 => 211986)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js 2017-02-09 21:31:35 UTC (rev 211986)
@@ -48,11 +48,6 @@
return ["loadedmetadata", "play", "pause"];
}
- get tracksToMonitor()
- {
- return [this.mediaController.media.videoTracks];
- }
-
handleEvent()
{
this._updateControls();
@@ -63,7 +58,7 @@
_updateControls()
{
const media = this.mediaController.media;
- const isVideo = media instanceof HTMLVideoElement && media.videoTracks.length > 0;
+ const isVideo = media instanceof HTMLVideoElement;
let shouldShowControls = this.mediaController.media.controls;
if (isVideo)
shouldShowControls = shouldShowControls && media.readyState > HTMLMediaElement.HAVE_NOTHING;
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js (211985 => 211986)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js 2017-02-09 21:20:44 UTC (rev 211985)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js 2017-02-09 21:31:35 UTC (rev 211986)
@@ -69,7 +69,7 @@
{
const control = this.control;
const media = this.mediaController.media;
- control.enabled = media.webkitSupportsFullscreen && media.videoTracks.length > 0;
+ control.enabled = media.webkitSupportsFullscreen;
control.isFullScreen = media.webkitDisplayingFullscreen;
}
