Reviewed by Mihai Parparita.
[chromium] Move media-file.js and video-test.js back to media/ for UILayoutTests
https://bugs.webkit.org/show_bug.cgi?id=55089
Media's UILayoutTests rely on video-test.js and media-file.js to be in
the media/ folder.
* http/tests/media/pdf-served-as-pdf.html:
* http/tests/media/reload-after-dialog.html:
* http/tests/media/remove-while-loading.html:
* http/tests/media/text-served-as-text.html:
* http/tests/media/video-buffered.html:
* http/tests/media/video-cancel-load.html:
* http/tests/media/video-cookie.html:
* http/tests/media/video-error-abort.html:
* http/tests/media/video-load-twice.html:
* http/tests/media/video-play-stall-seek.html:
* http/tests/media/video-play-stall.html:
* http/tests/media/video-play-suspend.html:
* http/tests/media/video-referer.html:
* http/tests/media/video-seekable-stall.html:
* http/tests/media/video-served-as-text.html:
* media/adopt-node-crash.html:
* media/audio-constructor-preload.html:
* media/audio-constructor-src.html:
* media/audio-constructor.html:
* media/audio-controls-rendering.html:
* media/audio-data-url.html:
* media/audio-delete-while-slider-thumb-clicked.html:
* media/audio-delete-while-step-button-clicked.html:
* media/audio-mpeg-supported.html:
* media/audio-mpeg4-supported.html:
* media/audio-play-event.html:
* media/before-load-member-access.html:
* media/broken-video.html:
* media/constructors.html:
* media/context-menu-actions.html:
* media/controls-after-reload.html:
* media/controls-css-overload.html:
* media/controls-drag-timebar.html:
* media/controls-right-click-on-timebar.html:
* media/controls-strict.html:
* media/controls-styling.html:
* media/controls-without-preload.html:
* media/event-attributes.html:
* media/invalid-media-url-crash.html:
* media/media-can-play-mpeg-audio.html:
* media/media-can-play-mpeg4-video.html:
* media/media-can-play-octet-stream.html:
* media/media-can-play-ogg.html:
* media/media-can-play-wav-audio.html:
* media/media-captions.html:
* media/media-constants.html:
* media/media-file.js: Renamed from LayoutTests/http/tests/media/media-file.js.
* media/media-fullscreen-inline.html:
* media/media-fullscreen-not-in-document.html:
* media/media-load-event.html:
* media/media-startTime.html:
* media/remove-from-document-no-load.html:
* media/remove-from-document.html:
* media/restore-from-page-cache.html:
* media/unsupported-rtsp.html:
* media/unsupported-tracks.html:
* media/video-append-source.html:
* media/video-aspect-ratio.html:
* media/video-autoplay.html:
* media/video-buffered.html:
* media/video-can-play-type.html:
* media/video-canvas-alpha.html:
* media/video-canvas-source.html:
* media/video-click-dblckick-standalone.html:
* media/video-controls-rendering.html:
* media/video-controls-transformed.html:
* media/video-controls-visible-audio-only.html:
* media/video-controls-zoomed.html:
* media/video-controls.html:
* media/video-currentTime-delay.html:
* media/video-currentTime-set.html:
* media/video-currentTime-set2.html:
* media/video-currentTime.html:
* media/video-delay-load-event.html:
* media/video-display-aspect-ratio.html:
* media/video-display-none-crash.html:
* media/video-display-toggle.html:
* media/video-does-not-loop.html:
* media/video-dom-autoplay.html:
* media/video-dom-preload.html:
* media/video-dom-src.html:
* media/video-duration-known-after-eos.html:
* media/video-error-does-not-exist.html:
* media/video-frame-accurate-seek.html:
* media/video-layer-crash.html:
* media/video-load-networkState.html:
* media/video-load-readyState.html:
* media/video-loop.html:
* media/video-muted.html:
* media/video-no-audio.html:
* media/video-no-autoplay.html:
* media/video-pause-empty-events.html:
* media/video-pause-immediately.html:
* media/video-play-empty-events.html:
* media/video-play-pause-events.html:
* media/video-play-pause-exception.html:
* media/video-played-collapse.html:
* media/video-played-ranges-1.html:
* media/video-played-reset.html:
* media/video-poster-delayed.html:
* media/video-poster-scale.html:
* media/video-poster.html:
* media/video-preload.html:
* media/video-replaces-poster.html:
* media/video-reverse-play-duration.html:
* media/video-seek-by-small-increment.html:
* media/video-seek-no-src-exception.html:
* media/video-seek-past-end-paused.html:
* media/video-seek-past-end-playing.html:
* media/video-seekable.html:
* media/video-seeking.html:
* media/video-size-intrinsic-scale.html:
* media/video-size.html:
* media/video-source-error-no-candidate.html:
* media/video-source-error.html:
* media/video-source-inserted.html:
* media/video-source-media.html:
* media/video-source-moved.html:
* media/video-source-none-supported.html:
* media/video-source-removed.html:
* media/video-source-type-params.html:
* media/video-source-type.html:
* media/video-source.html:
* media/video-src-change.html:
* media/video-src-invalid-remove.html:
* media/video-src-none.html:
* media/video-src-plus-source.html:
* media/video-src-remove.html:
* media/video-src-set.html:
* media/video-src-source.html:
* media/video-src.html:
* media/video-test.js: Renamed from LayoutTests/http/tests/media/video-test.js.
* media/video-timeupdate-during-playback.html:
* media/video-timeupdate-reverse-play.html:
* media/video-transformed.html:
* media/video-volume-slider.html:
* media/video-volume.html:
* media/video-width-height.html:
* media/video-zoom-controls.html:
* media/video-zoom.html:
2011-02-24 Victoria Kirst <vrk@google.com>
Reviewed by Mihai Parparita.
[chromium] Move media-file.js and video-test.js back to media/ for UILayoutTests
https://bugs.webkit.org/show_bug.cgi?id=55089
This adds an alias into the media/ directory so that http/tests/media
tests can access the media resources when running in an httpd process.
* Scripts/webkitperl/httpd.pm:
* Scripts/webkitpy/layout_tests/port/apache_http_server.py:
* Scripts/webkitpy/layout_tests/port/http_server.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79598
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-02-24 Victoria Kirst <vrk@google.com>
+
+ Reviewed by Mihai Parparita.
+
+ [chromium] Move media-file.js and video-test.js back to media/ for UILayoutTests
+ https://bugs.webkit.org/show_bug.cgi?id=55089
+
+ Media's UILayoutTests rely on video-test.js and media-file.js to be in
+ the media/ folder.
+
+ * http/tests/media/pdf-served-as-pdf.html:
+ * http/tests/media/reload-after-dialog.html:
+ * http/tests/media/remove-while-loading.html:
+ * http/tests/media/text-served-as-text.html:
+ * http/tests/media/video-buffered.html:
+ * http/tests/media/video-cancel-load.html:
+ * http/tests/media/video-cookie.html:
+ * http/tests/media/video-error-abort.html:
+ * http/tests/media/video-load-twice.html:
+ * http/tests/media/video-play-stall-seek.html:
+ * http/tests/media/video-play-stall.html:
+ * http/tests/media/video-play-suspend.html:
+ * http/tests/media/video-referer.html:
+ * http/tests/media/video-seekable-stall.html:
+ * http/tests/media/video-served-as-text.html:
+ * media/adopt-node-crash.html:
+ * media/audio-constructor-preload.html:
+ * media/audio-constructor-src.html:
+ * media/audio-constructor.html:
+ * media/audio-controls-rendering.html:
+ * media/audio-data-url.html:
+ * media/audio-delete-while-slider-thumb-clicked.html:
+ * media/audio-delete-while-step-button-clicked.html:
+ * media/audio-mpeg-supported.html:
+ * media/audio-mpeg4-supported.html:
+ * media/audio-play-event.html:
+ * media/before-load-member-access.html:
+ * media/broken-video.html:
+ * media/constructors.html:
+ * media/context-menu-actions.html:
+ * media/controls-after-reload.html:
+ * media/controls-css-overload.html:
+ * media/controls-drag-timebar.html:
+ * media/controls-right-click-on-timebar.html:
+ * media/controls-strict.html:
+ * media/controls-styling.html:
+ * media/controls-without-preload.html:
+ * media/event-attributes.html:
+ * media/invalid-media-url-crash.html:
+ * media/media-can-play-mpeg-audio.html:
+ * media/media-can-play-mpeg4-video.html:
+ * media/media-can-play-octet-stream.html:
+ * media/media-can-play-ogg.html:
+ * media/media-can-play-wav-audio.html:
+ * media/media-captions.html:
+ * media/media-constants.html:
+ * media/media-file.js: Renamed from LayoutTests/http/tests/media/media-file.js.
+ * media/media-fullscreen-inline.html:
+ * media/media-fullscreen-not-in-document.html:
+ * media/media-load-event.html:
+ * media/media-startTime.html:
+ * media/remove-from-document-no-load.html:
+ * media/remove-from-document.html:
+ * media/restore-from-page-cache.html:
+ * media/unsupported-rtsp.html:
+ * media/unsupported-tracks.html:
+ * media/video-append-source.html:
+ * media/video-aspect-ratio.html:
+ * media/video-autoplay.html:
+ * media/video-buffered.html:
+ * media/video-can-play-type.html:
+ * media/video-canvas-alpha.html:
+ * media/video-canvas-source.html:
+ * media/video-click-dblckick-standalone.html:
+ * media/video-controls-rendering.html:
+ * media/video-controls-transformed.html:
+ * media/video-controls-visible-audio-only.html:
+ * media/video-controls-zoomed.html:
+ * media/video-controls.html:
+ * media/video-currentTime-delay.html:
+ * media/video-currentTime-set.html:
+ * media/video-currentTime-set2.html:
+ * media/video-currentTime.html:
+ * media/video-delay-load-event.html:
+ * media/video-display-aspect-ratio.html:
+ * media/video-display-none-crash.html:
+ * media/video-display-toggle.html:
+ * media/video-does-not-loop.html:
+ * media/video-dom-autoplay.html:
+ * media/video-dom-preload.html:
+ * media/video-dom-src.html:
+ * media/video-duration-known-after-eos.html:
+ * media/video-error-does-not-exist.html:
+ * media/video-frame-accurate-seek.html:
+ * media/video-layer-crash.html:
+ * media/video-load-networkState.html:
+ * media/video-load-readyState.html:
+ * media/video-loop.html:
+ * media/video-muted.html:
+ * media/video-no-audio.html:
+ * media/video-no-autoplay.html:
+ * media/video-pause-empty-events.html:
+ * media/video-pause-immediately.html:
+ * media/video-play-empty-events.html:
+ * media/video-play-pause-events.html:
+ * media/video-play-pause-exception.html:
+ * media/video-played-collapse.html:
+ * media/video-played-ranges-1.html:
+ * media/video-played-reset.html:
+ * media/video-poster-delayed.html:
+ * media/video-poster-scale.html:
+ * media/video-poster.html:
+ * media/video-preload.html:
+ * media/video-replaces-poster.html:
+ * media/video-reverse-play-duration.html:
+ * media/video-seek-by-small-increment.html:
+ * media/video-seek-no-src-exception.html:
+ * media/video-seek-past-end-paused.html:
+ * media/video-seek-past-end-playing.html:
+ * media/video-seekable.html:
+ * media/video-seeking.html:
+ * media/video-size-intrinsic-scale.html:
+ * media/video-size.html:
+ * media/video-source-error-no-candidate.html:
+ * media/video-source-error.html:
+ * media/video-source-inserted.html:
+ * media/video-source-media.html:
+ * media/video-source-moved.html:
+ * media/video-source-none-supported.html:
+ * media/video-source-removed.html:
+ * media/video-source-type-params.html:
+ * media/video-source-type.html:
+ * media/video-source.html:
+ * media/video-src-change.html:
+ * media/video-src-invalid-remove.html:
+ * media/video-src-none.html:
+ * media/video-src-plus-source.html:
+ * media/video-src-remove.html:
+ * media/video-src-set.html:
+ * media/video-src-source.html:
+ * media/video-src.html:
+ * media/video-test.js: Renamed from LayoutTests/http/tests/media/video-test.js.
+ * media/video-timeupdate-during-playback.html:
+ * media/video-timeupdate-reverse-play.html:
+ * media/video-transformed.html:
+ * media/video-volume-slider.html:
+ * media/video-volume.html:
+ * media/video-width-height.html:
+ * media/video-zoom-controls.html:
+ * media/video-zoom.html:
+
2011-02-24 Anna Cavender <annacc@chromium.org>
Reviewed by Ojan Vafai.
<html>
<head>
<title>PDF file served as 'application/pdf'</title>
- <script src=video-test.js></script>
+ <script src=../../media-resources/video-test.js></script>
<script>
function loadedmetadata(evt)
{
<!DOCTYPE html>
<html>
<head>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
+ <script src=../../media-resources/media-file.js></script>
+ <script src=../../media-resources/video-test.js></script>
<script>
var loadCount = 0;
<video></video>
<p>Test that removing a media element from the tree while loading does not crash.</p>
-<script src=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
<script>
waitForEvent('loadedmetadata', function () {
run("document.body.removeChild(video)");
<html>
<head>
<title>text file served as 'text/plain'</title>
- <script src=video-test.js></script>
+ <script src=../../media-resources/video-test.js></script>
<script>
function loadedmetadata(evt)
{
<p>Start playing a video with preloading enabled, do a seek near the
end and check multiple buffered timeranges have been created.</p>
<video id="video" preload="auto" autobuffer></video>
-<script src=video-test.js></script>
-<script src=media-file.js></script>
+<script src=../../media-resources/video-test.js></script>
+<script src=../../media-resources/media-file.js></script>
<script>
function delayedSeek() {
testExpected("video.buffered.length", 1, "==");
If this test is successful it will terminate with a blank page.
This test should finish without crashing.
- <script src=media-file.js></script>
- <script src=video-test.js></script>
+ <script src=../../media-resources/media-file.js></script>
+ <script src=../../media-resources/video-test.js></script>
<video controls id="video"></video>
<textarea id="child_content" style="display: none;">
</head>
<body onload="loadCookie()">
<video id="video"></video>
-<script src=video-test.js></script>
-<script src=media-file.js></script>
+<script src=../../media-resources/video-test.js></script>
+<script src=../../media-resources/media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
<html>
<head>
<title>'abort' event test</title>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
+ <script src=../../media-resources/media-file.js></script>
+ <script src=../../media-resources/video-test.js></script>
<script>
var didLoad = false;
<html>
<head>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../../media-resources/media-file.js></script>
+<script src=../../media-resources/video-test.js></script>
<script>
var file = findMediaFile("video", "http://127.0.0.1:8000/resources/test");
<video controls></video>
<p>Test that playback can be resumed by seeking backwards after load stalls.</p>
-<script src=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
<script>
var waitingCount = 0;
<video></video>
<p>Test that stalled, timeupdate and waiting events are sent when media load stalls in the middle.</p>
-<script src=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
<script>
var timeupdateCount = 0;
<html>
<head>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
+ <script src=../../media-resources/media-file.js></script>
+ <script src=../../media-resources/video-test.js></script>
<script>
function start() {
findMediaElement();
</head>
<body onload="loadCookieAndReferer()">
<video id="video"></video>
-<script src=video-test.js></script>
-<script src=media-file.js></script>
+<script src=../../media-resources/video-test.js></script>
+<script src=../../media-resources/media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.setAlwaysAcceptCookies(true);
<video></video>
<p>Test seekable range when video load is incomplete.</p>
-<script src=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
<script>
waitForEvent('canplay', function () {
test("video.seekable");
<html>
<head>
<title>media file served as 'text/plain'</title>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
+ <script src=../../media-resources/media-file.js></script>
+ <script src=../../media-resources/video-test.js></script>
<script>
function loadedmetadata(evt)
{
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
<body>
<p>Test that Audio("url") constructor loads the specified resource.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
var audioFile = findMediaFile("audio", "content/test");
var audio = new Audio(audioFile);
<body>
<p>Test that Audio() object loads the resource after src attribute is set and load() is called.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
var audio = new Audio();
<style>
audio { background-color: blue; }
</style>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
function test()
{
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
<audio controls></audio>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var timeupdateEventCount = 0;
mediaElement = document.getElementsByTagName('audio')[0];
<audio controls></audio>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var timeupdateEventCount = 0;
mediaElement = document.getElementsByTagName('audio')[0];
<html>
<head>
<title>'play' event</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function start()
<html>
<head>
<title>Test that accessing member of a non loaded video works.</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function test()
{
<video controls></video>
<p>Test that QuickTime file with broken content generates an error.<p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
video.src = findMediaFile("video", "content/garbage");
<p>Test that media constructors behave consistently.</p>
<video></video>
<audio></audio>
-<script src=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
<script>
var audioJS = new Audio();
var videoElem = document.getElementsByTagName('video')[0];
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src="media-file.js"></script>
+ <script src=video-test.js></script>
<script>
function playing()
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
var video;
var loadedCount = 0;
display:none;
}
</style>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
</head>
<body>
<video class="nocontrols" width=300 height=200 controls></video>
<html>
<head>
<title>drag timebar test</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var x;
var y;
<html>
<head>
<title>right click on timebar test</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
<!DOCTYPE HTML>
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
</head>
<body onload="setSrcByTagName('video', findMediaFile('video', 'content/test')); init()">
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
<style>
.override {
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController)
layoutTestController.waitUntilDone();
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var ratechangeCount = 0;
var playingCount = 0;
<html>
<body>
<p>Tests that invalid media src url does not result in crash.</p>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var invalid_url = "http:aa" + String.fromCharCode(0) + "%aa#aa";
var error_count = 0;
<style>
video { background-color: yellow; width: 320px; height: 240px;}
</style>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function start()
{
<style>
video { background-color: yellow; width: 320px; height: 240px;}
</style>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function start()
{
<style>
video { background-color: yellow; width: 320px; height: 240px;}
</style>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function test()
{
<p>Test HTMLMediaElement <em>canPlayType()</em> method for ogg media containers.</p>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
video = mediaElement = document.getElementsByTagName('video')[0];
<!doctype html>
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function start()
{
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>closed caption API test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script src=media-fullscreen.js></script>
<script>
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script type="text/javascript">
function doTest ()
{
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>inline <video> element fullscreen test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script src=media-fullscreen.js></script>
<script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>not in document <video> element fullscreen test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script src=media-fullscreen.js></script>
<script>
var movieInfo =
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
<html>
<head>
<title>startTime attribute test</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function loadeddata()
<video controls></video>
<p>Test that removing a media element from the tree when no media has been loaded does not generate a loadstart event.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
didReceiveLoadStartEvent = false;
video.addEventListener('loadstart', function() { didReceiveLoadStartEvent = true; });
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script type="text/javascript" charset="utf-8">
function doSetup()
{
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var mediaFile = findMediaFile("video", "content/test");
var loadCount = 0;
<p>Test that QuickTime file with RTSP URL generates a load error.<p>
-<script src=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
<script>
video.src = "rtsp://a2047.v1411b.c1411.g.vq.akamaistream.net/5/2047/1411/2_h264_650/1a1a1ae454c430950065de4cbb2f94c226950c7ae655b61a48a91475e243acda3dac194879adde0f/wwdc_2006_2_650.mov";
waitForEvent("error", function () {
<video controls></video>
<p>Test that QuickTime file with unsupported track types only generates an error.<p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
video.src = findMediaFile("video", "content/unsupported_track");
waitForEvent("error", function () {
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.currentSrc", "");
-<script src="../http/tests/media/media-file.js"></script>
+<script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
<body onload="setSrcByTagName('video', findMediaFile('video', 'content/test')); init()">
<p>Test video sizing. You should see one bigger image (paused video) and 7 small ones of 1/4 its size. </p>
<video autoplay controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.autoplay", true);
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.buffered.length", 0);
testException("video.buffered.start(-1)", "DOMException.INDEX_SIZE_ERR");
<p>Test HTMLMediaElement <em>canPlayType()</em> method.</p>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
video = mediaElement = document.getElementsByTagName('video')[0];
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script>
if (window.layoutTestController) {
<head>
<title>Drawing to canvas using video with source element does not taint canvas</title>
<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
var ctx;
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
<p>Test that controls don't increase the size of the container (i.e. are
rendered overlapping with the video canvas).<p>
-<script src="../http/tests/media/media-file.js" type="text/javascript"></script>
+<script src="media-file.js" type="text/javascript"></script>
<iframe style="width: 400px; height: 300px; border: 0px;" id="container"> </iframe>
-<script src="../http/tests/media/media-file.js"></script>
+<script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
<body>
<p>Test controls placement. </p>
<video controls></video>
<p>Test controls on transformed video.</p>
<p>This test only runs in DRT!</p>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
testExpected("video.controls", null, '!=');
waitForEvent('canplaythrough', function () {
#no-video-media { background-color: yellow; width: 320px; height: 100px;}
#mouse-parking:hover { padding:8; background-color: blue; }
</style>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
margin: 50px;
}
</style>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script type="text/javascript" charset="utf-8">
function runTest()
{
<video controls></video>
<p>Test controls on zoomed video.</p>
<p>This test only runs in DRT!</p>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
testExpected("video.controls", null, '!=');
waitForEvent('canplaythrough', function() {
<video controls></video>
<p>Test 'controls' attribute<p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.controls", null, '!=');
waitForEvent('canplaythrough', function () {
<p>Test a delay in playing the movie results in a canPlay event.</p>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
waitForEvent('canplaythrough',
function () {
<p>Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time</p>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
waitForEvent('canplaythrough',
function () {
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
waitForEvent('canplaythrough',
function () {
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.currentTime", 0)
waitForEvent('canplaythrough', function() { testExpected("video.currentTime", 0); } );
<head>
<title>delay document 'load' event test</title>
<style> video { border: 3px solid red; } </style>
- <script src=../http/tests/media/video-test.js></script>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
<script>
var video;
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.videoWidth", 0, "==");
testExpected("video.videoHeight", 0, "==");
<video controls></video>
<p>Test that pause() after changing display to "none" doesn't cause a crash.</p>
-<script src="../http/tests/media/media-file.js"></script>
-<script src="../http/tests/media/video-test.js"></script>
+<script src="media-file.js"></script>
+<script src="video-test.js"></script>
<script>
video.src = findMediaFile("video", "content/test");
video.play();
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
function toggleDisplay()
{
<html>
<head>
<style> video { height: 25px; width: 300px; } </style>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var seekCount = 0;
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.autoplay", false);
video.autoplay = true;
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function setPreload(value, expected)
{
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.currentSrc", "");
var mediaFile = findMediaFile("video", "content/test");
<head>
<title>local video</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function ended()
<p>Test that the media element is in correct state after load fails.</p>
<video controls></video>
-<script src=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
<script>
consoleWrite("");
<!DOCTYPE html>
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
</head>
<body onload="setSrcByTagName('video', findMediaFile('video', 'content/test-25fps')); init()">
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
<style>
video { width:200px; border: 3px solid red; -webkit-box-reflect: below 5px; }
events and end up with networkState >= NETWORK_LOADING.
</p>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function testNetworkState(expected, endit, op)
{
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
function testReadyState(expected, endit, op)
{
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var seekCount = 0;
<video controls></video>
<p>Test 'muted' attribute<p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.muted", false);
run("video.muted = true");
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController)
layoutTestController.waitUntilDone();
<video controls></video>
<p>Test that play event does not fire when "src" set with no autoplay attribute.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.paused", true);
<video controls></video>
<p>Test that pause() from EMPTY network state triggers load()</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
video.src = findMediaFile("video", "content/test");
testExpected("video.networkState", HTMLMediaElement.NETWORK_NO_SOURCE);
<html>
<head>
<title>Test pause() pauses the clock immediately</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var timeAfterPause;
<video controls></video>
<p>Test that play() from EMPTY network state triggers load() and async play event.</p>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
testExpected("video.networkState", HTMLMediaElement.NETWORK_EMPTY);
<video controls></video>
<p>Test that calling play() and pause() triggers async play, timeupdate and pause events.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
video.src = findMediaFile("video", "content/test.mp4");
<p>Video has no src. Test that the playing event is not dispatched.</p>
-<script src=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
<script>
waitForEventAndFail('playing');
<html>
<head>
<title>Test of 'played' attribute</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script src=video-played.js></script>
<script>
<html>
<head>
<title>Test of 'played' attribute</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script src=video-played.js></script>
<script>
<html>
<head>
<title>Test of 'played' attribute</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script src=video-played.js></script>
<script>
that shutdown is clean, since DumpRenderTree used to crash in this case.</p>
<video autoplay id="video"></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script type="text/javascript">
if (window.layoutTestController)
layoutTestController.dumpAsText();
<html>
<head>
<title>Delayed load of poster should not overwrite intrinsic size of video</title>
- <script src=../http/tests/media/video-test.js></script>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
<style>
video {
border: 3px solid red;
<html>
<head>
<title>'poster' aspect ratio test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<style>
video {
border: 3px solid red;
<html>
<head>
<title><video> element with poster size test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var posterInfo =
{
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var timer = null;
<!DOCTYPE html>
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
layoutTestController.waitUntilDone();
<head>
<title>local video</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
<!DOCTYPE HTML>
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
var seekedEventCount = 0;
<p>Test that seeking video with no 'src' attribute throws an INVALID_STATE_ERR exception.</p>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
testExpected("video.networkState", HTMLMediaElement.NETWORK_EMPTY);
testExpected("video.readyState", HTMLMediaElement.HAVE_NOTHING);
<video controls></video>
<p>Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
waitForEvent('canplaythrough', function () {
<video loop controls></video>
<p>Test that seeking video with 'loop' past it's end rewinds to the beginning and continues playback.</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
var timeupdateEventCount = 0;
<video controls></video>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.seekable.length", 0);
testException("video.seekable.start(-1)", "DOMException.INDEX_SIZE_ERR");
goes back to false when seeking completes, and that a 'seeked' event
is fired for each seek
</p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
var seekedCount = 0;
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><video> element intrinsic size test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
<html>
<head>
<title><video> element size and resize test</title>
- <script src=../http/tests/media/video-test.js></script>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
<script>
var movieInfo =
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><video> and <source> error test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><video> and <source> error test</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
<html>
<head>
<title>networkState after inserting <source> test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
</head>
<body>
<video controls><source></video>
<body>
-<script src=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
<video controls>
<source src=content/error.mpeg media="print">
<source src=content/error2.mpeg media="screen and (min-device-width: 80000px)">
<html>
<head>
<title>moving <source> element test</title>
- <script src=../http/tests/media/video-test.js></script>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
<script>
var testInfo =
<html>
<head>
<title>no usable <source> test</title>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function setup()
<html>
<head>
<title>crash after removing <source> test</title>
- <script src=../http/tests/media/video-test.js></script>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
<script>
var testInfo =
<body>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<video controls>
<source src=content/bogus.mpeg type="video/blahblah">
<source src=content/test.mp4 type="video/mpeg; codecs="avc1.4D400C"">
<head>
<title> <source> @type attribute</title>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function setup()
{
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function test()
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
<script>
var mediaFile;
var loadedCount = 0;
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var state;
<html>
<body>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<video src=content/bogus.mpeg controls>
<source src=content/test.mp4>
<html>
<body>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<div id=panel></div>
<script>
var panel = document.getElementById("panel");
<video controls></video>
<div>Test that setting src attribute triggers load</div>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
var mediaFile = findMediaFile("video", "content/test");
video.setAttribute('src', mediaFile);
<body>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<div id=panel></div>
<script>
var panel = document.getElementById("panel");
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
function test()
<p>
Test 'timeupdate' events are posted while playing but not while paused.
</p>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
setSrcByTagName("video", findMediaFile("video", "content/test"));
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
<script>
-<script src="../http/tests/media/media-file.js"></script>
+<script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
<body>
<style>
<html>
<head>
<title>Test rendering of volume slider of video tag</title>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
var video;
<video controls></video>
<p>Test 'volume' attribute<p>
-<script src=../http/tests/media/media-file.js></script>
-<script src=../http/tests/media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.volume", 1.0);
run("video.volume = 0.5");
<video width=100 height=50 controls></video>
-<script src=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
<script>
testExpected("video.width", 100);
testExpected("video.height", 50);
-webkit-transform: rotate(10deg);
}
</style>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
</head>
<body onload="setSrcByTagName('video', findMediaFile('video', 'content/test')); init()">
<html>
<head>
<style> video { zoom: 150%; border: 3px solid red; } </style>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
function init()
{
+2011-02-24 Victoria Kirst <vrk@google.com>
+
+ Reviewed by Mihai Parparita.
+
+ [chromium] Move media-file.js and video-test.js back to media/ for UILayoutTests
+ https://bugs.webkit.org/show_bug.cgi?id=55089
+
+ This adds an alias into the media/ directory so that http/tests/media
+ tests can access the media resources when running in an httpd process.
+
+ * Scripts/webkitperl/httpd.pm:
+ * Scripts/webkitpy/layout_tests/port/apache_http_server.py:
+ * Scripts/webkitpy/layout_tests/port/http_server.py:
+
2011-02-24 Andrew Wilson <atwilson@chromium.org>
Unreviewed, rolling out r79570.
my $httpdConfig = getHTTPDConfigPathForTestDirectory($testDirectory);
my $documentRoot = "$testDirectory/http/tests";
my $jsTestResourcesDirectory = $testDirectory . "/fast/js/resources";
+ my $mediaResourcesDirectory = $testDirectory . "/media";
my $typesConfig = "$testDirectory/http/conf/mime.types";
my $httpdLockFile = File::Spec->catfile($httpdPidDir, "httpd.lock");
my $httpdScoreBoardFile = File::Spec->catfile($httpdPidDir, "httpd.scoreboard");
"-C", "DocumentRoot \"$documentRoot\"",
# Setup a link to where the js test templates are stored, use -c so that mod_alias will already be loaded.
"-c", "Alias /js-test-resources \"$jsTestResourcesDirectory\"",
+ "-c", "Alias /media-resources \"$mediaResourcesDirectory\"",
"-c", "TypesConfig \"$typesConfig\"",
"-c", "PidFile \"$httpdPidFile\"",
"-c", "ScoreBoardFile \"$httpdScoreBoardFile\"",
test_dir = self._port_obj.layout_tests_dir()
js_test_resources_dir = self._cygwin_safe_join(test_dir, "fast", "js",
"resources")
+ media_resources_dir = self._cygwin_safe_join(test_dir, "media")
mime_types_path = self._cygwin_safe_join(test_dir, "http", "conf",
"mime.types")
cert_file = self._cygwin_safe_join(test_dir, "http", "conf",
'-f', "\"%s\"" % self._get_apache_config_file_path(test_dir, output_dir),
'-C', "\'DocumentRoot \"%s\"\'" % document_root,
'-c', "\'Alias /js-test-resources \"%s\"'" % js_test_resources_dir,
+ '-c', "\'Alias /media-resources \"%s\"'" % media_resources_dir,
'-C', "\'Listen %s\'" % "127.0.0.1:8000",
'-C', "\'Listen %s\'" % "127.0.0.1:8081",
'-c', "\'TypesConfig \"%s\"\'" % mime_types_path,
self._port_obj.layout_tests_dir(), 'http', 'tests')
self._js_test_resource = os.path.join(
self._port_obj.layout_tests_dir(), 'fast', 'js', 'resources')
+ self._media_resource = os.path.join(
+ self._port_obj.layout_tests_dir(), 'media')
+
except:
self._webkit_tests = None
self._js_test_resource = None
+ self._media_resource = None
# Self generated certificate for SSL server (for client cert get
# <base-path>\chrome\test\data\ssl\certs\root_ca_cert.crt)
f.write(('alias.url = ( "/js-test-resources" => "%s" )\n\n') %
(self._js_test_resource))
+ # Setup a link to where the media resources are stored.
+ f.write(('alias.url = ( "/media-resources" => "%s" )\n\n') %
+ (self._media_resource))
+
# dump out of virtual host config at the bottom.
if self._root:
if self._port: