Skip to content

GitLab

T
tangled
Commit 1674a85c authored by Miguel Casas-Sanchez's avatar Miguel Casas-Sanchez Committed by Commit Bot
Browse files
Options

Capture from HTMLMediaElement: move LayoutTests to external/wpt 

This CL moves the three standard functionality LayoutTests for 
mediacapture-fromelement to the external/wpt folder, adapting 
them accordingly and adding the necessary webmfiles.

Also removes the HTMLMediaElementCapture-*.html expectations.

Bug: 619625
Change-Id: If06df91ae918b5f0d3eacc597c88709a83227a82
Reviewed-on: https://chromium-review.googlesource.com/566151
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Reviewed-by: default avatarEmircan Uysaler <emircan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486677}
parent 7843a8af
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 14 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-features=NetworkService
View file @ 1674a85c
......@@ -547,9 +547,6 @@ Bug(none) fast/loader/simultaneous-reloads-assert.html [ Failure ]
Bug(none) fast/loader/stateobjects/pushstate-in-data-url-denied.html [ Failure ]
Bug(none) fast/loader/url-strip-cr-lf-tab.html [ Failure ]
Bug(none) fast/media/mq-color-gamut-picture.html [ Failure ]
Bug(none) fast/mediacapturefromelement/HTMLMediaElementCapture-capture.html [ Timeout ]
Bug(none) fast/mediacapturefromelement/HTMLMediaElementCapture-creation.html [ Timeout ]
Bug(none) fast/mediacapturefromelement/HTMLMediaElementCapture-ended.html [ Timeout ]
Bug(none) fast/mediarecorder/BlobEvent-basic.html [ Failure ]
Bug(none) fast/mediastream/MediaStreamTrack-clone.html [ Timeout ]
Bug(none) fast/mediastream/MediaStreamTrack-contentHint.html [ Timeout ]
......
third_party/WebKit/LayoutTests/fast/mediacapturefromelement/HTMLMediaElementCapture-capture.html → third_party/WebKit/LayoutTests/external/wpt/mediacapture-fromelement/capture.html
View file @ 1674a85c
<!DOCTYPE html>
<script src=../../resources/testharness.js></script>
<script src=../../resources/testharnessreport.js></script>
<html>
<head>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
</head>
<body>
<script>
// Run captureStream() on different videos, and assert data is flowing.
......@@ -8,7 +12,7 @@
var makeAsyncTest = function(filename) {
async_test(function(test) {
var video = document.createElement('video');
video.src = "../../http/tests/media/resources/media-source/webm/" + filename;
video.src = "webm/" + filename;
video.onerror = this.unreached_func("<video> error");
video.play();
......@@ -32,3 +36,5 @@ generate_tests(makeAsyncTest, [
]);
</script>
</body>
</html>
third_party/WebKit/LayoutTests/fast/mediacapturefromelement/HTMLMediaElementCapture-creation.html → third_party/WebKit/LayoutTests/external/wpt/mediacapture-fromelement/creation.html
View file @ 1674a85c
<!DOCTYPE html>
<script src=../../resources/testharness.js></script>
<script src=../../resources/testharnessreport.js></script>
<html>
<head>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
</head>
<body>
<script>
// Run captureStream() on <video>/<audio>s and inspect the generated Stream.
......@@ -8,7 +12,7 @@
var makeAsyncTest = function(filename, numTracks) {
async_test(function() {
var video = document.createElement('video');
video.src = "../../http/tests/media/resources/media-source/webm/" + filename;
video.src = "webm/" + filename;
video.onerror = this.unreached_func("<video> error");
video.play();
......@@ -27,7 +31,9 @@ var makeAsyncTest = function(filename, numTracks) {
generate_tests(makeAsyncTest, [
[ "video-only", "test-v-128k-320x240-24fps-8kfr.webm", {vid : 1, aud : 0} ],
[ "audio-only", "test-a-128k-44100Hz-1ch.webm", {vid : 0, aud : 1} ],
[ "video+audio", "test.webm", {vid : 1, aud : 1} ]
[ "video+audio", "test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm", {vid : 1, aud : 1} ]
]);
</script>
</body>
</html>
third_party/WebKit/LayoutTests/fast/mediacapturefromelement/HTMLMediaElementCapture-ended.html → third_party/WebKit/LayoutTests/external/wpt/mediacapture-fromelement/ended.html
View file @ 1674a85c
<!DOCTYPE html>
<script src=../../resources/testharness.js></script>
<script src=../../resources/testharnessreport.js></script>
<html>
<head>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
</head>
<body>
<script>
// Run captureStream() on different videos, and assert the mediastream is
......@@ -9,7 +13,7 @@
var makeAsyncTest = function(filename) {
async_test(function(test) {
var video = document.createElement('video');
video.src = "../../http/tests/media/resources/media-source/webm/" + filename;
video.src = "webm/" + filename;
video.onerror = this.unreached_func("<video> error");
video.play();
......@@ -21,7 +25,7 @@ var makeAsyncTest = function(filename) {
assert_false(stream.active, 'stream must be inactive');
});
}), "<video>.captureStream() and assert data flows.";
}), "<video>.captureStream() and assert ended event.";
};
generate_tests(makeAsyncTest, [
......@@ -31,3 +35,5 @@ generate_tests(makeAsyncTest, [
]);
</script>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment