Skip to content
Permalink
Browse files
Rebaseline media control tests when new media control appearances are…
… finalized

https://bugs.webkit.org/show_bug.cgi?id=142142

Reviewed by Brent Fulgham.

* fullscreen/video-controls-override.html: Test height as an integer.
* http/tests/media/hls/video-controls-live-stream.html: Start playback explicitly instead of
  using autoplay, and pause playback before dumping controls state to make the test results
  more deterministic.
* media/audio-delete-while-slider-thumb-clicked.html: Make the <audio> element wide enough
  that it will always have a timeline scrubber. Trigger test on 'canplaythrough' instead of
  autoplay + 'playing' to simplify the test slightly.
* media/nodesFromRect-shadowContent.html: Test for controls panel-background instead
  timeline-container because of changes to the controls structure.
* platform/mac-mavericks/media/audio-controls-rendering-expected.png: Removed.
* platform/mac-mavericks/media/audio-controls-rendering-expected.txt: Removed.
* platform/mac-mavericks/media/video-volume-slider-expected.txt: Removed.
* platform/mac-wk1/media/controls-styling-expected.txt: Removed.
* platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt: Added
* platform/mac-yosemite/media: Added.
* platform/mac-yosemite/media/controls-styling-expected.txt: Added.
* platform/mac/TestExpectations: Unskip some tests.
* platform/mac/accessibility/media-element-expected.txt: Update results.
* platform/mac/fast/layers/video-layer-expected.png: Ditto.
* platform/mac/fast/layers/video-layer-expected.txt: Ditto.
* platform/mac/fullscreen/video-controls-override-expected.txt: Ditto.
* platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt: Ditto.
* platform/mac/media/audio-controls-rendering-expected.png: Ditto.
* platform/mac/media/audio-controls-rendering-expected.txt: Ditto.
* platform/mac/media/controls-after-reload-expected.png: Ditto.
* platform/mac/media/controls-after-reload-expected.txt: Ditto.
* platform/mac/media/controls-strict-expected.png: Ditto.
* platform/mac/media/controls-strict-expected.txt: Ditto.
* platform/mac/media/controls-styling-expected.png: Ditto.
* platform/mac/media/controls-styling-expected.txt: Ditto.
* platform/mac/media/controls-without-preload-expected.png: Ditto.
* platform/mac/media/controls-without-preload-expected.txt: Ditto.
* platform/mac/media/media-controls-clone-expected.png: Ditto.
* platform/mac/media/media-controls-clone-expected.txt: Ditto.
* platform/mac/media/media-document-audio-repaint-expected.png: Ditto.
* platform/mac/media/video-controls-rendering-expected.png: Ditto.
* platform/mac/media/video-controls-rendering-expected.txt: Ditto.
* platform/mac/media/video-display-toggle-expected.png: Ditto.
* platform/mac/media/video-display-toggle-expected.txt: Ditto.
* platform/mac/media/video-empty-source-expected.png: Ditto.
* platform/mac/media/video-empty-source-expected.txt: Ditto.
* platform/mac/media/video-no-audio-expected.png: Ditto.
* platform/mac/media/video-no-audio-expected.txt: Ditto.
* platform/mac/media/video-volume-slider-expected.png: Ditto.
* platform/mac/media/video-volume-slider-expected.txt: Ditto.
* platform/mac/media/video-zoom-controls-expected.png: Ditto.
* platform/mac/media/video-zoom-controls-expected.txt: Ditto.


Canonical link: https://commits.webkit.org/174201@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198912 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eric-carlson committed Mar 31, 2016
1 parent b6f9ab9 commit 7e94266a680445fdf96128d2c0b1a507e672e5cd
Show file tree
Hide file tree
Showing 42 changed files with 897 additions and 996 deletions.
@@ -1,3 +1,58 @@
2016-03-31 Eric Carlson <eric.carlson@apple.com>

Rebaseline media control tests when new media control appearances are finalized
https://bugs.webkit.org/show_bug.cgi?id=142142

Reviewed by Brent Fulgham.

* fullscreen/video-controls-override.html: Test height as an integer.
* http/tests/media/hls/video-controls-live-stream.html: Start playback explicitly instead of
using autoplay, and pause playback before dumping controls state to make the test results
more deterministic.
* media/audio-delete-while-slider-thumb-clicked.html: Make the <audio> element wide enough
that it will always have a timeline scrubber. Trigger test on 'canplaythrough' instead of
autoplay + 'playing' to simplify the test slightly.
* media/nodesFromRect-shadowContent.html: Test for controls panel-background instead
timeline-container because of changes to the controls structure.
* platform/mac-mavericks/media/audio-controls-rendering-expected.png: Removed.
* platform/mac-mavericks/media/audio-controls-rendering-expected.txt: Removed.
* platform/mac-mavericks/media/video-volume-slider-expected.txt: Removed.
* platform/mac-wk1/media/controls-styling-expected.txt: Removed.
* platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt: Added
* platform/mac-yosemite/media: Added.
* platform/mac-yosemite/media/controls-styling-expected.txt: Added.
* platform/mac/TestExpectations: Unskip some tests.
* platform/mac/accessibility/media-element-expected.txt: Update results.
* platform/mac/fast/layers/video-layer-expected.png: Ditto.
* platform/mac/fast/layers/video-layer-expected.txt: Ditto.
* platform/mac/fullscreen/video-controls-override-expected.txt: Ditto.
* platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt: Ditto.
* platform/mac/media/audio-controls-rendering-expected.png: Ditto.
* platform/mac/media/audio-controls-rendering-expected.txt: Ditto.
* platform/mac/media/controls-after-reload-expected.png: Ditto.
* platform/mac/media/controls-after-reload-expected.txt: Ditto.
* platform/mac/media/controls-strict-expected.png: Ditto.
* platform/mac/media/controls-strict-expected.txt: Ditto.
* platform/mac/media/controls-styling-expected.png: Ditto.
* platform/mac/media/controls-styling-expected.txt: Ditto.
* platform/mac/media/controls-without-preload-expected.png: Ditto.
* platform/mac/media/controls-without-preload-expected.txt: Ditto.
* platform/mac/media/media-controls-clone-expected.png: Ditto.
* platform/mac/media/media-controls-clone-expected.txt: Ditto.
* platform/mac/media/media-document-audio-repaint-expected.png: Ditto.
* platform/mac/media/video-controls-rendering-expected.png: Ditto.
* platform/mac/media/video-controls-rendering-expected.txt: Ditto.
* platform/mac/media/video-display-toggle-expected.png: Ditto.
* platform/mac/media/video-display-toggle-expected.txt: Ditto.
* platform/mac/media/video-empty-source-expected.png: Ditto.
* platform/mac/media/video-empty-source-expected.txt: Ditto.
* platform/mac/media/video-no-audio-expected.png: Ditto.
* platform/mac/media/video-no-audio-expected.txt: Ditto.
* platform/mac/media/video-volume-slider-expected.png: Ditto.
* platform/mac/media/video-volume-slider-expected.txt: Ditto.
* platform/mac/media/video-zoom-controls-expected.png: Ditto.
* platform/mac/media/video-zoom-controls-expected.txt: Ditto.

2016-03-31 Ryan Haddad <ryanhaddad@apple.com>

Moving a few skipped tests from ios-simulator-wk2 to ios-simulator TestExpectations file.
@@ -23,7 +23,7 @@
testExpected("panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel')", null, "!=");
testExpected("internals.shadowPseudoId(panel)", "-webkit-media-controls-panel");
testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none', "!=");
testExpected("document.defaultView.getComputedStyle(panel)['height']", '20px', ">=");
testExpected("parseInt(document.defaultView.getComputedStyle(panel)['height'])", '20', ">=");
}
else
logResult(false, "window.internals == undefined");
@@ -8,26 +8,30 @@

function start() {
video = document.getElementById('video');
waitForEvent('canplaythrough', function() { video.play(); });
waitForEvent('play', playing);
waitForEventAndFail('stalled');
video.src = "../resources/hls/test-live.php";
}

function playing() {
testExpected('video.duration', Infinity);
video.pause();
setTimeout(function() {
testExpected('video.duration', Infinity);

controls = internals.shadowRoot(video).firstChild.firstChild;
dumpMediaControlsTree(controls);
controls = internals.shadowRoot(video).firstChild.firstChild;
dumpMediaControlsTree(controls);

timeline = mediaControlsElement(controls, "-webkit-media-controls-timeline");
test('timeline == null || timeline.disabled', false);
timeline = mediaControlsElement(controls, "-webkit-media-controls-timeline");
test('timeline == null || timeline.disabled', false);

endTest();
endTest()
}, 200);
}

</script>
</head>
<body onload="start()">
<video id="video" autoplay controls></video>
<video id="video" controls></video>
</body>
</html>
@@ -1,6 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<style>
audio { width: 400px; }
</style>
<script src=media-file.js></script>
<script src=video-test.js></script>
<script src=media-controls.js></script>
@@ -84,7 +87,7 @@
{
setSrcByTagName("audio", findMediaFile("audio", "content/test"));

// Remove the element after seeking started
audio.addEventListener("canplaythrough", drag);
audio.addEventListener("seeking", deleteAudio);
}

@@ -95,7 +98,7 @@
<br>
<input type="button" id="button" value="Click Me!" onmouseup="log('button click!')">
<br>
<audio id="audio" autoplay onplaying="drag()" controls></audio><br><br>
<audio id="audio" controls></audio><br><br>
<div id="console"></div>
</body>
</html>
@@ -35,7 +35,7 @@

check(clickX, clickY, 100, 100, 20, 20, [e.v1, e.body]);

var shadow =['-webkit-media-controls-timeline-container', '-webkit-media-controls-play-button', '-webkit-media-controls-panel', '-webkit-media-controls'];
var shadow =['-webkit-media-controls-panel-background', '-webkit-media-controls-play-button', '-webkit-media-controls-panel', '-webkit-media-controls'];
checkShadowContent(clickX, clickY, 10, 10, 20, 20, shadow);
}
</script>

This file was deleted.

This file was deleted.

0 comments on commit 7e94266

Please sign in to comment.