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 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@79630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eca002f..c0d4aa4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,154 @@
+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 Dan Bernstein <mitz@apple.com>
Reviewed by Dave Hyatt.
diff --git a/LayoutTests/http/tests/media/pdf-served-as-pdf.html b/LayoutTests/http/tests/media/pdf-served-as-pdf.html
index 69dfc51..e19c1a4 100644
--- a/LayoutTests/http/tests/media/pdf-served-as-pdf.html
+++ b/LayoutTests/http/tests/media/pdf-served-as-pdf.html
@@ -2,7 +2,7 @@
<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)
{
diff --git a/LayoutTests/http/tests/media/reload-after-dialog.html b/LayoutTests/http/tests/media/reload-after-dialog.html
index 943b026..87f6eff 100644
--- a/LayoutTests/http/tests/media/reload-after-dialog.html
+++ b/LayoutTests/http/tests/media/reload-after-dialog.html
@@ -1,8 +1,8 @@
<!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;
diff --git a/LayoutTests/http/tests/media/remove-while-loading.html b/LayoutTests/http/tests/media/remove-while-loading.html
index b7aea82..5015b38 100644
--- a/LayoutTests/http/tests/media/remove-while-loading.html
+++ b/LayoutTests/http/tests/media/remove-while-loading.html
@@ -1,6 +1,6 @@
<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)");
diff --git a/LayoutTests/http/tests/media/text-served-as-text.html b/LayoutTests/http/tests/media/text-served-as-text.html
index 5975205..7c02db4 100644
--- a/LayoutTests/http/tests/media/text-served-as-text.html
+++ b/LayoutTests/http/tests/media/text-served-as-text.html
@@ -2,7 +2,7 @@
<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)
{
diff --git a/LayoutTests/http/tests/media/video-buffered.html b/LayoutTests/http/tests/media/video-buffered.html
index 9eb75a0..105ca94 100644
--- a/LayoutTests/http/tests/media/video-buffered.html
+++ b/LayoutTests/http/tests/media/video-buffered.html
@@ -5,8 +5,8 @@
<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, "==");
diff --git a/LayoutTests/http/tests/media/video-cancel-load.html b/LayoutTests/http/tests/media/video-cancel-load.html
index 08f504b..885ce45 100644
--- a/LayoutTests/http/tests/media/video-cancel-load.html
+++ b/LayoutTests/http/tests/media/video-cancel-load.html
@@ -7,8 +7,8 @@
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;">
diff --git a/LayoutTests/http/tests/media/video-cookie.html b/LayoutTests/http/tests/media/video-cookie.html
index cb0f43c..06defa2 100644
--- a/LayoutTests/http/tests/media/video-cookie.html
+++ b/LayoutTests/http/tests/media/video-cookie.html
@@ -3,8 +3,8 @@
</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();
diff --git a/LayoutTests/http/tests/media/video-error-abort.html b/LayoutTests/http/tests/media/video-error-abort.html
index b64c869..192e405 100644
--- a/LayoutTests/http/tests/media/video-error-abort.html
+++ b/LayoutTests/http/tests/media/video-error-abort.html
@@ -2,8 +2,8 @@
<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;
diff --git a/LayoutTests/http/tests/media/video-load-twice.html b/LayoutTests/http/tests/media/video-load-twice.html
index 165ec3c..3c39047 100644
--- a/LayoutTests/http/tests/media/video-load-twice.html
+++ b/LayoutTests/http/tests/media/video-load-twice.html
@@ -1,7 +1,7 @@
<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");
diff --git a/LayoutTests/http/tests/media/video-play-stall-seek.html b/LayoutTests/http/tests/media/video-play-stall-seek.html
index 03d8744..82acd62 100644
--- a/LayoutTests/http/tests/media/video-play-stall-seek.html
+++ b/LayoutTests/http/tests/media/video-play-stall-seek.html
@@ -1,6 +1,6 @@
<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;
diff --git a/LayoutTests/http/tests/media/video-play-stall.html b/LayoutTests/http/tests/media/video-play-stall.html
index 969ec22..af54811 100644
--- a/LayoutTests/http/tests/media/video-play-stall.html
+++ b/LayoutTests/http/tests/media/video-play-stall.html
@@ -1,6 +1,6 @@
<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;
diff --git a/LayoutTests/http/tests/media/video-play-suspend.html b/LayoutTests/http/tests/media/video-play-suspend.html
index 5789e73..092e907 100644
--- a/LayoutTests/http/tests/media/video-play-suspend.html
+++ b/LayoutTests/http/tests/media/video-play-suspend.html
@@ -1,7 +1,7 @@
<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();
diff --git a/LayoutTests/http/tests/media/video-referer.html b/LayoutTests/http/tests/media/video-referer.html
index 7953c60..e6e9f79 100644
--- a/LayoutTests/http/tests/media/video-referer.html
+++ b/LayoutTests/http/tests/media/video-referer.html
@@ -3,8 +3,8 @@
</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);
diff --git a/LayoutTests/http/tests/media/video-seekable-stall.html b/LayoutTests/http/tests/media/video-seekable-stall.html
index 9326e2a..ad47d05 100644
--- a/LayoutTests/http/tests/media/video-seekable-stall.html
+++ b/LayoutTests/http/tests/media/video-seekable-stall.html
@@ -1,6 +1,6 @@
<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");
diff --git a/LayoutTests/http/tests/media/video-served-as-text.html b/LayoutTests/http/tests/media/video-served-as-text.html
index 69ef325..4c00cb3 100644
--- a/LayoutTests/http/tests/media/video-served-as-text.html
+++ b/LayoutTests/http/tests/media/video-served-as-text.html
@@ -2,8 +2,8 @@
<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)
{
diff --git a/LayoutTests/media/adopt-node-crash.html b/LayoutTests/media/adopt-node-crash.html
index 4f3e861..993a14d 100644
--- a/LayoutTests/media/adopt-node-crash.html
+++ b/LayoutTests/media/adopt-node-crash.html
@@ -2,7 +2,7 @@
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
diff --git a/LayoutTests/media/audio-constructor-preload.html b/LayoutTests/media/audio-constructor-preload.html
index da582b9..d3a104f 100644
--- a/LayoutTests/media/audio-constructor-preload.html
+++ b/LayoutTests/media/audio-constructor-preload.html
@@ -1,7 +1,7 @@
<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>
diff --git a/LayoutTests/media/audio-constructor-src.html b/LayoutTests/media/audio-constructor-src.html
index b9eb336..078f905 100644
--- a/LayoutTests/media/audio-constructor-src.html
+++ b/LayoutTests/media/audio-constructor-src.html
@@ -1,7 +1,7 @@
<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);
diff --git a/LayoutTests/media/audio-constructor.html b/LayoutTests/media/audio-constructor.html
index 00971e0..5c13e26 100644
--- a/LayoutTests/media/audio-constructor.html
+++ b/LayoutTests/media/audio-constructor.html
@@ -1,8 +1,8 @@
<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();
diff --git a/LayoutTests/media/audio-controls-rendering.html b/LayoutTests/media/audio-controls-rendering.html
index d75410b..43e0c1d 100644
--- a/LayoutTests/media/audio-controls-rendering.html
+++ b/LayoutTests/media/audio-controls-rendering.html
@@ -3,7 +3,7 @@
<style>
audio { background-color: blue; }
</style>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
function test()
{
diff --git a/LayoutTests/media/audio-data-url.html b/LayoutTests/media/audio-data-url.html
index 8386769..9dd2b37 100644
--- a/LayoutTests/media/audio-data-url.html
+++ b/LayoutTests/media/audio-data-url.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
diff --git a/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html b/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
index 9ade2c2..6345ce5 100644
--- a/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
+++ b/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
@@ -1,7 +1,7 @@
<!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();
diff --git a/LayoutTests/media/audio-delete-while-step-button-clicked.html b/LayoutTests/media/audio-delete-while-step-button-clicked.html
index 0aa7896..d087d5c 100644
--- a/LayoutTests/media/audio-delete-while-step-button-clicked.html
+++ b/LayoutTests/media/audio-delete-while-step-button-clicked.html
@@ -1,7 +1,7 @@
<!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();
diff --git a/LayoutTests/media/audio-mpeg-supported.html b/LayoutTests/media/audio-mpeg-supported.html
index 0ec2887..1407f6d 100644
--- a/LayoutTests/media/audio-mpeg-supported.html
+++ b/LayoutTests/media/audio-mpeg-supported.html
@@ -5,7 +5,7 @@
<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];
diff --git a/LayoutTests/media/audio-mpeg4-supported.html b/LayoutTests/media/audio-mpeg4-supported.html
index 270d5c3..bab7f65 100644
--- a/LayoutTests/media/audio-mpeg4-supported.html
+++ b/LayoutTests/media/audio-mpeg4-supported.html
@@ -5,7 +5,7 @@
<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];
diff --git a/LayoutTests/media/audio-play-event.html b/LayoutTests/media/audio-play-event.html
index 596a205..315df8e 100644
--- a/LayoutTests/media/audio-play-event.html
+++ b/LayoutTests/media/audio-play-event.html
@@ -1,8 +1,8 @@
<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()
diff --git a/LayoutTests/media/before-load-member-access.html b/LayoutTests/media/before-load-member-access.html
index f2671d5..58866a5 100644
--- a/LayoutTests/media/before-load-member-access.html
+++ b/LayoutTests/media/before-load-member-access.html
@@ -1,7 +1,7 @@
<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()
{
diff --git a/LayoutTests/media/broken-video.html b/LayoutTests/media/broken-video.html
index 40234aa..3aa8424 100644
--- a/LayoutTests/media/broken-video.html
+++ b/LayoutTests/media/broken-video.html
@@ -1,7 +1,7 @@
<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");
diff --git a/LayoutTests/media/constructors.html b/LayoutTests/media/constructors.html
index 3c844af..61125ee 100644
--- a/LayoutTests/media/constructors.html
+++ b/LayoutTests/media/constructors.html
@@ -2,7 +2,7 @@
<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];
diff --git a/LayoutTests/media/context-menu-actions.html b/LayoutTests/media/context-menu-actions.html
index 993bd60..ae80f14 100644
--- a/LayoutTests/media/context-menu-actions.html
+++ b/LayoutTests/media/context-menu-actions.html
@@ -1,7 +1,7 @@
<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()
diff --git a/LayoutTests/media/controls-after-reload.html b/LayoutTests/media/controls-after-reload.html
index b0c7def..4998235 100644
--- a/LayoutTests/media/controls-after-reload.html
+++ b/LayoutTests/media/controls-after-reload.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
var video;
var loadedCount = 0;
diff --git a/LayoutTests/media/controls-css-overload.html b/LayoutTests/media/controls-css-overload.html
index 5b680f5..8ac44b51 100644
--- a/LayoutTests/media/controls-css-overload.html
+++ b/LayoutTests/media/controls-css-overload.html
@@ -12,7 +12,7 @@
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>
diff --git a/LayoutTests/media/controls-drag-timebar.html b/LayoutTests/media/controls-drag-timebar.html
index 402388f..ea2416a 100644
--- a/LayoutTests/media/controls-drag-timebar.html
+++ b/LayoutTests/media/controls-drag-timebar.html
@@ -2,8 +2,8 @@
<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;
diff --git a/LayoutTests/media/controls-right-click-on-timebar.html b/LayoutTests/media/controls-right-click-on-timebar.html
index 0e24234..fad0373 100644
--- a/LayoutTests/media/controls-right-click-on-timebar.html
+++ b/LayoutTests/media/controls-right-click-on-timebar.html
@@ -1,8 +1,8 @@
<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();
diff --git a/LayoutTests/media/controls-strict.html b/LayoutTests/media/controls-strict.html
index 88560aa..de5b4de 100644
--- a/LayoutTests/media/controls-strict.html
+++ b/LayoutTests/media/controls-strict.html
@@ -1,7 +1,7 @@
<!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()">
diff --git a/LayoutTests/media/controls-styling.html b/LayoutTests/media/controls-styling.html
index e3f0a11..453ae46 100644
--- a/LayoutTests/media/controls-styling.html
+++ b/LayoutTests/media/controls-styling.html
@@ -1,6 +1,6 @@
<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 {
diff --git a/LayoutTests/media/controls-without-preload.html b/LayoutTests/media/controls-without-preload.html
index 3eb35e7..95b3531 100644
--- a/LayoutTests/media/controls-without-preload.html
+++ b/LayoutTests/media/controls-without-preload.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController)
layoutTestController.waitUntilDone();
diff --git a/LayoutTests/media/event-attributes.html b/LayoutTests/media/event-attributes.html
index 10d092d..bc9610a 100644
--- a/LayoutTests/media/event-attributes.html
+++ b/LayoutTests/media/event-attributes.html
@@ -1,8 +1,8 @@
<!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;
diff --git a/LayoutTests/media/invalid-media-url-crash.html b/LayoutTests/media/invalid-media-url-crash.html
index b66bbad..73f9be6 100644
--- a/LayoutTests/media/invalid-media-url-crash.html
+++ b/LayoutTests/media/invalid-media-url-crash.html
@@ -1,7 +1,7 @@
<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;
diff --git a/LayoutTests/media/media-can-play-mpeg-audio.html b/LayoutTests/media/media-can-play-mpeg-audio.html
index 32355d5..9889469 100644
--- a/LayoutTests/media/media-can-play-mpeg-audio.html
+++ b/LayoutTests/media/media-can-play-mpeg-audio.html
@@ -3,7 +3,7 @@
<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()
{
diff --git a/LayoutTests/media/media-can-play-mpeg4-video.html b/LayoutTests/media/media-can-play-mpeg4-video.html
index c96325b..7a9e67f 100644
--- a/LayoutTests/media/media-can-play-mpeg4-video.html
+++ b/LayoutTests/media/media-can-play-mpeg4-video.html
@@ -3,7 +3,7 @@
<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()
{
diff --git a/LayoutTests/media/media-can-play-octet-stream.html b/LayoutTests/media/media-can-play-octet-stream.html
index e5a76b5..bc6fc39 100644
--- a/LayoutTests/media/media-can-play-octet-stream.html
+++ b/LayoutTests/media/media-can-play-octet-stream.html
@@ -5,7 +5,7 @@
<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()
{
diff --git a/LayoutTests/media/media-can-play-ogg.html b/LayoutTests/media/media-can-play-ogg.html
index 885a987..4ac9aa7 100644
--- a/LayoutTests/media/media-can-play-ogg.html
+++ b/LayoutTests/media/media-can-play-ogg.html
@@ -10,7 +10,7 @@
<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];
diff --git a/LayoutTests/media/media-can-play-wav-audio.html b/LayoutTests/media/media-can-play-wav-audio.html
index 750961c..94adeda 100644
--- a/LayoutTests/media/media-can-play-wav-audio.html
+++ b/LayoutTests/media/media-can-play-wav-audio.html
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function start()
{
diff --git a/LayoutTests/media/media-captions.html b/LayoutTests/media/media-captions.html
index 9361ee4..b2f4565 100644
--- a/LayoutTests/media/media-captions.html
+++ b/LayoutTests/media/media-captions.html
@@ -3,7 +3,7 @@
<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>
diff --git a/LayoutTests/media/media-constants.html b/LayoutTests/media/media-constants.html
index f30d173..b4ad1a6 100644
--- a/LayoutTests/media/media-constants.html
+++ b/LayoutTests/media/media-constants.html
@@ -1,7 +1,7 @@
<!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 ()
{
diff --git a/LayoutTests/http/tests/media/media-file.js b/LayoutTests/media/media-file.js
similarity index 100%
rename from LayoutTests/http/tests/media/media-file.js
rename to LayoutTests/media/media-file.js
diff --git a/LayoutTests/media/media-fullscreen-inline.html b/LayoutTests/media/media-fullscreen-inline.html
index fd7008b..571ec81 100644
--- a/LayoutTests/media/media-fullscreen-inline.html
+++ b/LayoutTests/media/media-fullscreen-inline.html
@@ -3,7 +3,7 @@
<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>
diff --git a/LayoutTests/media/media-fullscreen-not-in-document.html b/LayoutTests/media/media-fullscreen-not-in-document.html
index db01f48..dbb5bee 100644
--- a/LayoutTests/media/media-fullscreen-not-in-document.html
+++ b/LayoutTests/media/media-fullscreen-not-in-document.html
@@ -3,7 +3,7 @@
<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 =
diff --git a/LayoutTests/media/media-load-event.html b/LayoutTests/media/media-load-event.html
index ad3a31e..e8382bd 100644
--- a/LayoutTests/media/media-load-event.html
+++ b/LayoutTests/media/media-load-event.html
@@ -1,7 +1,7 @@
<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>
diff --git a/LayoutTests/media/media-startTime.html b/LayoutTests/media/media-startTime.html
index 172633a..afe21eb 100644
--- a/LayoutTests/media/media-startTime.html
+++ b/LayoutTests/media/media-startTime.html
@@ -1,8 +1,8 @@
<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()
diff --git a/LayoutTests/media/remove-from-document-no-load.html b/LayoutTests/media/remove-from-document-no-load.html
index 76ff145..1cb37bb 100644
--- a/LayoutTests/media/remove-from-document-no-load.html
+++ b/LayoutTests/media/remove-from-document-no-load.html
@@ -1,7 +1,7 @@
<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; });
diff --git a/LayoutTests/media/remove-from-document.html b/LayoutTests/media/remove-from-document.html
index 131991f..d95f6aa 100644
--- a/LayoutTests/media/remove-from-document.html
+++ b/LayoutTests/media/remove-from-document.html
@@ -1,8 +1,8 @@
<!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()
{
diff --git a/LayoutTests/media/restore-from-page-cache.html b/LayoutTests/media/restore-from-page-cache.html
index 47cc82b..a125e42 100644
--- a/LayoutTests/media/restore-from-page-cache.html
+++ b/LayoutTests/media/restore-from-page-cache.html
@@ -1,7 +1,7 @@
<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;
diff --git a/LayoutTests/media/unsupported-rtsp.html b/LayoutTests/media/unsupported-rtsp.html
index 6247573..bea9820 100644
--- a/LayoutTests/media/unsupported-rtsp.html
+++ b/LayoutTests/media/unsupported-rtsp.html
@@ -3,7 +3,7 @@
<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 () {
diff --git a/LayoutTests/media/unsupported-tracks.html b/LayoutTests/media/unsupported-tracks.html
index fbe9a27..57d05c9 100644
--- a/LayoutTests/media/unsupported-tracks.html
+++ b/LayoutTests/media/unsupported-tracks.html
@@ -1,7 +1,7 @@
<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 () {
diff --git a/LayoutTests/media/video-append-source.html b/LayoutTests/media/video-append-source.html
index 7de73f5..00b79ef 100644
--- a/LayoutTests/media/video-append-source.html
+++ b/LayoutTests/media/video-append-source.html
@@ -1,6 +1,6 @@
<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", "");
diff --git a/LayoutTests/media/video-aspect-ratio.html b/LayoutTests/media/video-aspect-ratio.html
index 3b260d4..ffd95a9 100644
--- a/LayoutTests/media/video-aspect-ratio.html
+++ b/LayoutTests/media/video-aspect-ratio.html
@@ -1,4 +1,4 @@
-<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>
diff --git a/LayoutTests/media/video-autoplay.html b/LayoutTests/media/video-autoplay.html
index 075cee9..e1d8ba2 100644
--- a/LayoutTests/media/video-autoplay.html
+++ b/LayoutTests/media/video-autoplay.html
@@ -1,6 +1,6 @@
<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);
diff --git a/LayoutTests/media/video-buffered.html b/LayoutTests/media/video-buffered.html
index 8d94a8d..2885fd4 100644
--- a/LayoutTests/media/video-buffered.html
+++ b/LayoutTests/media/video-buffered.html
@@ -1,6 +1,6 @@
<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");
diff --git a/LayoutTests/media/video-can-play-type.html b/LayoutTests/media/video-can-play-type.html
index 7fe0d56..873381d 100644
--- a/LayoutTests/media/video-can-play-type.html
+++ b/LayoutTests/media/video-can-play-type.html
@@ -10,7 +10,7 @@
<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];
diff --git a/LayoutTests/media/video-canvas-alpha.html b/LayoutTests/media/video-canvas-alpha.html
index 26a4087..9001ae1 100644
--- a/LayoutTests/media/video-canvas-alpha.html
+++ b/LayoutTests/media/video-canvas-alpha.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../http/tests/media/media-file.js"></script>
+ <script src="media-file.js"></script>
<script>
if (window.layoutTestController) {
diff --git a/LayoutTests/media/video-canvas-source.html b/LayoutTests/media/video-canvas-source.html
index d93ea5a..1b3efd7 100644
--- a/LayoutTests/media/video-canvas-source.html
+++ b/LayoutTests/media/video-canvas-source.html
@@ -2,8 +2,8 @@
<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;
diff --git a/LayoutTests/media/video-click-dblckick-standalone.html b/LayoutTests/media/video-click-dblckick-standalone.html
index 578aa16..7a13e43 100644
--- a/LayoutTests/media/video-click-dblckick-standalone.html
+++ b/LayoutTests/media/video-click-dblckick-standalone.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
diff --git a/LayoutTests/media/video-controls-in-media-document.html b/LayoutTests/media/video-controls-in-media-document.html
index ea20186..0ba5c43 100644
--- a/LayoutTests/media/video-controls-in-media-document.html
+++ b/LayoutTests/media/video-controls-in-media-document.html
@@ -1,6 +1,6 @@
<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>
diff --git a/LayoutTests/media/video-controls-rendering.html b/LayoutTests/media/video-controls-rendering.html
index 3e2e252..0ef5084 100644
--- a/LayoutTests/media/video-controls-rendering.html
+++ b/LayoutTests/media/video-controls-rendering.html
@@ -1,4 +1,4 @@
-<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>
diff --git a/LayoutTests/media/video-controls-transformed.html b/LayoutTests/media/video-controls-transformed.html
index 552df33..e3ff120 100644
--- a/LayoutTests/media/video-controls-transformed.html
+++ b/LayoutTests/media/video-controls-transformed.html
@@ -12,8 +12,8 @@
<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 () {
diff --git a/LayoutTests/media/video-controls-visible-audio-only.html b/LayoutTests/media/video-controls-visible-audio-only.html
index 5b49e9b..826d359 100644
--- a/LayoutTests/media/video-controls-visible-audio-only.html
+++ b/LayoutTests/media/video-controls-visible-audio-only.html
@@ -5,7 +5,7 @@
#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();
diff --git a/LayoutTests/media/video-controls-zoomed.html b/LayoutTests/media/video-controls-zoomed.html
index 9995e2a..5325248 100644
--- a/LayoutTests/media/video-controls-zoomed.html
+++ b/LayoutTests/media/video-controls-zoomed.html
@@ -6,7 +6,7 @@
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()
{
@@ -28,7 +28,7 @@
<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() {
diff --git a/LayoutTests/media/video-controls.html b/LayoutTests/media/video-controls.html
index 59b6f06..6d596a4 100644
--- a/LayoutTests/media/video-controls.html
+++ b/LayoutTests/media/video-controls.html
@@ -1,7 +1,7 @@
<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 () {
diff --git a/LayoutTests/media/video-currentTime-delay.html b/LayoutTests/media/video-currentTime-delay.html
index 9edda7e..91ce631 100644
--- a/LayoutTests/media/video-currentTime-delay.html
+++ b/LayoutTests/media/video-currentTime-delay.html
@@ -5,8 +5,8 @@
<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 () {
diff --git a/LayoutTests/media/video-currentTime-set.html b/LayoutTests/media/video-currentTime-set.html
index 4294259..688081c 100644
--- a/LayoutTests/media/video-currentTime-set.html
+++ b/LayoutTests/media/video-currentTime-set.html
@@ -5,8 +5,8 @@
<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 () {
diff --git a/LayoutTests/media/video-currentTime-set2.html b/LayoutTests/media/video-currentTime-set2.html
index 7ad24d2..8221cca 100644
--- a/LayoutTests/media/video-currentTime-set2.html
+++ b/LayoutTests/media/video-currentTime-set2.html
@@ -1,6 +1,6 @@
<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 () {
diff --git a/LayoutTests/media/video-currentTime.html b/LayoutTests/media/video-currentTime.html
index 04068cb..f0f2a45 100644
--- a/LayoutTests/media/video-currentTime.html
+++ b/LayoutTests/media/video-currentTime.html
@@ -1,6 +1,6 @@
<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); } );
diff --git a/LayoutTests/media/video-delay-load-event.html b/LayoutTests/media/video-delay-load-event.html
index 4c84e85..ae5e11c 100644
--- a/LayoutTests/media/video-delay-load-event.html
+++ b/LayoutTests/media/video-delay-load-event.html
@@ -3,8 +3,8 @@
<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;
diff --git a/LayoutTests/media/video-display-aspect-ratio.html b/LayoutTests/media/video-display-aspect-ratio.html
index 2ac69ca..b66da18c 100644
--- a/LayoutTests/media/video-display-aspect-ratio.html
+++ b/LayoutTests/media/video-display-aspect-ratio.html
@@ -1,6 +1,6 @@
<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, "==");
diff --git a/LayoutTests/media/video-display-none-crash.html b/LayoutTests/media/video-display-none-crash.html
index 6ec1bbe..4f66c1c 100644
--- a/LayoutTests/media/video-display-none-crash.html
+++ b/LayoutTests/media/video-display-none-crash.html
@@ -1,7 +1,7 @@
<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();
diff --git a/LayoutTests/media/video-display-toggle.html b/LayoutTests/media/video-display-toggle.html
index 2a995d6..9b7e037 100644
--- a/LayoutTests/media/video-display-toggle.html
+++ b/LayoutTests/media/video-display-toggle.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
function toggleDisplay()
{
diff --git a/LayoutTests/media/video-does-not-loop.html b/LayoutTests/media/video-does-not-loop.html
index 6433c5a..3a30d74 100644
--- a/LayoutTests/media/video-does-not-loop.html
+++ b/LayoutTests/media/video-does-not-loop.html
@@ -2,7 +2,7 @@
<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;
diff --git a/LayoutTests/media/video-dom-autoplay.html b/LayoutTests/media/video-dom-autoplay.html
index 9bf1463..12fa569 100644
--- a/LayoutTests/media/video-dom-autoplay.html
+++ b/LayoutTests/media/video-dom-autoplay.html
@@ -1,6 +1,6 @@
<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;
diff --git a/LayoutTests/media/video-dom-preload.html b/LayoutTests/media/video-dom-preload.html
index aca3c50..02f79de 100644
--- a/LayoutTests/media/video-dom-preload.html
+++ b/LayoutTests/media/video-dom-preload.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
function setPreload(value, expected)
{
diff --git a/LayoutTests/media/video-dom-src.html b/LayoutTests/media/video-dom-src.html
index b563eed..0abdf7e 100644
--- a/LayoutTests/media/video-dom-src.html
+++ b/LayoutTests/media/video-dom-src.html
@@ -1,6 +1,6 @@
<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");
diff --git a/LayoutTests/media/video-duration-known-after-eos.html b/LayoutTests/media/video-duration-known-after-eos.html
index f671855..9efa0f3 100644
--- a/LayoutTests/media/video-duration-known-after-eos.html
+++ b/LayoutTests/media/video-duration-known-after-eos.html
@@ -4,8 +4,8 @@
<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()
diff --git a/LayoutTests/media/video-error-does-not-exist.html b/LayoutTests/media/video-error-does-not-exist.html
index d567c6e..35015bc 100644
--- a/LayoutTests/media/video-error-does-not-exist.html
+++ b/LayoutTests/media/video-error-does-not-exist.html
@@ -1,6 +1,6 @@
<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("");
diff --git a/LayoutTests/media/video-frame-accurate-seek.html b/LayoutTests/media/video-frame-accurate-seek.html
index 0425a7d..07c936a 100644
--- a/LayoutTests/media/video-frame-accurate-seek.html
+++ b/LayoutTests/media/video-frame-accurate-seek.html
@@ -1,7 +1,7 @@
<!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()">
diff --git a/LayoutTests/media/video-layer-crash.html b/LayoutTests/media/video-layer-crash.html
index 5e2dba3..b5844d6 100644
--- a/LayoutTests/media/video-layer-crash.html
+++ b/LayoutTests/media/video-layer-crash.html
@@ -1,6 +1,6 @@
<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; }
diff --git a/LayoutTests/media/video-load-networkState.html b/LayoutTests/media/video-load-networkState.html
index e198317f..eee64ac 100644
--- a/LayoutTests/media/video-load-networkState.html
+++ b/LayoutTests/media/video-load-networkState.html
@@ -8,8 +8,8 @@
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)
{
diff --git a/LayoutTests/media/video-load-readyState.html b/LayoutTests/media/video-load-readyState.html
index a7bec95..d0402ac 100644
--- a/LayoutTests/media/video-load-readyState.html
+++ b/LayoutTests/media/video-load-readyState.html
@@ -1,6 +1,6 @@
<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)
{
diff --git a/LayoutTests/media/video-loop.html b/LayoutTests/media/video-loop.html
index 7ad940e..f37cd68 100644
--- a/LayoutTests/media/video-loop.html
+++ b/LayoutTests/media/video-loop.html
@@ -1,8 +1,8 @@
<!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;
diff --git a/LayoutTests/media/video-muted.html b/LayoutTests/media/video-muted.html
index 2e1940f..431f8cd 100644
--- a/LayoutTests/media/video-muted.html
+++ b/LayoutTests/media/video-muted.html
@@ -1,7 +1,7 @@
<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");
diff --git a/LayoutTests/media/video-no-audio.html b/LayoutTests/media/video-no-audio.html
index fb79b5c..f411e15 100644
--- a/LayoutTests/media/video-no-audio.html
+++ b/LayoutTests/media/video-no-audio.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src=../http/tests/media/media-file.js></script>
+ <script src=media-file.js></script>
<script>
if (window.layoutTestController)
layoutTestController.waitUntilDone();
diff --git a/LayoutTests/media/video-no-autoplay.html b/LayoutTests/media/video-no-autoplay.html
index 7fc4e59..38920ce 100644
--- a/LayoutTests/media/video-no-autoplay.html
+++ b/LayoutTests/media/video-no-autoplay.html
@@ -1,7 +1,7 @@
<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);
diff --git a/LayoutTests/media/video-pause-empty-events.html b/LayoutTests/media/video-pause-empty-events.html
index e9093a0..9c157db 100644
--- a/LayoutTests/media/video-pause-empty-events.html
+++ b/LayoutTests/media/video-pause-empty-events.html
@@ -1,7 +1,7 @@
<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);
diff --git a/LayoutTests/media/video-pause-immediately.html b/LayoutTests/media/video-pause-immediately.html
index 159f63f..aa36036 100644
--- a/LayoutTests/media/video-pause-immediately.html
+++ b/LayoutTests/media/video-pause-immediately.html
@@ -1,8 +1,8 @@
<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;
diff --git a/LayoutTests/media/video-play-empty-events.html b/LayoutTests/media/video-play-empty-events.html
index 8d1abfb..dea1480 100644
--- a/LayoutTests/media/video-play-empty-events.html
+++ b/LayoutTests/media/video-play-empty-events.html
@@ -3,8 +3,8 @@
<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);
diff --git a/LayoutTests/media/video-play-pause-events.html b/LayoutTests/media/video-play-pause-events.html
index 0dd2e33..87ec781 100644
--- a/LayoutTests/media/video-play-pause-events.html
+++ b/LayoutTests/media/video-play-pause-events.html
@@ -1,7 +1,7 @@
<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");
diff --git a/LayoutTests/media/video-play-pause-exception.html b/LayoutTests/media/video-play-pause-exception.html
index 2f6f86e..de62401 100644
--- a/LayoutTests/media/video-play-pause-exception.html
+++ b/LayoutTests/media/video-play-pause-exception.html
@@ -4,7 +4,7 @@
<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');
diff --git a/LayoutTests/media/video-played-collapse.html b/LayoutTests/media/video-played-collapse.html
index 3280ed2..5e81fb4 100644
--- a/LayoutTests/media/video-played-collapse.html
+++ b/LayoutTests/media/video-played-collapse.html
@@ -1,8 +1,8 @@
<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>
diff --git a/LayoutTests/media/video-played-ranges-1.html b/LayoutTests/media/video-played-ranges-1.html
index 58e3a59..8013160 100644
--- a/LayoutTests/media/video-played-ranges-1.html
+++ b/LayoutTests/media/video-played-ranges-1.html
@@ -1,8 +1,8 @@
<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>
diff --git a/LayoutTests/media/video-played-reset.html b/LayoutTests/media/video-played-reset.html
index 72da054..dbc25e6 100644
--- a/LayoutTests/media/video-played-reset.html
+++ b/LayoutTests/media/video-played-reset.html
@@ -1,8 +1,8 @@
<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>
diff --git a/LayoutTests/media/video-plays-past-end-of-test.html b/LayoutTests/media/video-plays-past-end-of-test.html
index 2004214..8591b5d 100644
--- a/LayoutTests/media/video-plays-past-end-of-test.html
+++ b/LayoutTests/media/video-plays-past-end-of-test.html
@@ -2,8 +2,8 @@
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();
diff --git a/LayoutTests/media/video-poster-delayed.html b/LayoutTests/media/video-poster-delayed.html
index 77f6431..ac74f23 100644
--- a/LayoutTests/media/video-poster-delayed.html
+++ b/LayoutTests/media/video-poster-delayed.html
@@ -3,8 +3,8 @@
<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;
diff --git a/LayoutTests/media/video-poster-scale.html b/LayoutTests/media/video-poster-scale.html
index 9866c70..f87507d 100644
--- a/LayoutTests/media/video-poster-scale.html
+++ b/LayoutTests/media/video-poster-scale.html
@@ -3,7 +3,7 @@
<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;
diff --git a/LayoutTests/media/video-poster.html b/LayoutTests/media/video-poster.html
index 5f9d072..a246dcd 100644
--- a/LayoutTests/media/video-poster.html
+++ b/LayoutTests/media/video-poster.html
@@ -1,7 +1,7 @@
<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 =
{
diff --git a/LayoutTests/media/video-preload.html b/LayoutTests/media/video-preload.html
index 3e8f79f..e264b88 100644
--- a/LayoutTests/media/video-preload.html
+++ b/LayoutTests/media/video-preload.html
@@ -2,8 +2,8 @@
<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;
diff --git a/LayoutTests/media/video-replaces-poster.html b/LayoutTests/media/video-replaces-poster.html
index 2b49753..4003251 100644
--- a/LayoutTests/media/video-replaces-poster.html
+++ b/LayoutTests/media/video-replaces-poster.html
@@ -1,7 +1,7 @@
<!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();
diff --git a/LayoutTests/media/video-reverse-play-duration.html b/LayoutTests/media/video-reverse-play-duration.html
index 63e4fb3..a43c53d 100644
--- a/LayoutTests/media/video-reverse-play-duration.html
+++ b/LayoutTests/media/video-reverse-play-duration.html
@@ -4,8 +4,8 @@
<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>
diff --git a/LayoutTests/media/video-seek-by-small-increment.html b/LayoutTests/media/video-seek-by-small-increment.html
index 73bce9e..12aa8dd 100644
--- a/LayoutTests/media/video-seek-by-small-increment.html
+++ b/LayoutTests/media/video-seek-by-small-increment.html
@@ -1,8 +1,8 @@
<!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;
diff --git a/LayoutTests/media/video-seek-no-src-exception.html b/LayoutTests/media/video-seek-no-src-exception.html
index cf0aacc..7d304ae 100644
--- a/LayoutTests/media/video-seek-no-src-exception.html
+++ b/LayoutTests/media/video-seek-no-src-exception.html
@@ -5,7 +5,7 @@
<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);
diff --git a/LayoutTests/media/video-seek-past-end-paused.html b/LayoutTests/media/video-seek-past-end-paused.html
index b5d6b54..e9c784e 100644
--- a/LayoutTests/media/video-seek-past-end-paused.html
+++ b/LayoutTests/media/video-seek-past-end-paused.html
@@ -1,8 +1,8 @@
<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 () {
diff --git a/LayoutTests/media/video-seek-past-end-playing.html b/LayoutTests/media/video-seek-past-end-playing.html
index eb36a96..9191d3b 100644
--- a/LayoutTests/media/video-seek-past-end-playing.html
+++ b/LayoutTests/media/video-seek-past-end-playing.html
@@ -3,8 +3,8 @@
<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;
diff --git a/LayoutTests/media/video-seekable.html b/LayoutTests/media/video-seekable.html
index 797a1e2..d7366a8 100644
--- a/LayoutTests/media/video-seekable.html
+++ b/LayoutTests/media/video-seekable.html
@@ -1,6 +1,6 @@
<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");
diff --git a/LayoutTests/media/video-seeking.html b/LayoutTests/media/video-seeking.html
index a38d3ef..a8c6b5a 100644
--- a/LayoutTests/media/video-seeking.html
+++ b/LayoutTests/media/video-seeking.html
@@ -3,8 +3,8 @@
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;
diff --git a/LayoutTests/media/video-size-intrinsic-scale.html b/LayoutTests/media/video-size-intrinsic-scale.html
index cdd5290..22eb4cb 100644
--- a/LayoutTests/media/video-size-intrinsic-scale.html
+++ b/LayoutTests/media/video-size-intrinsic-scale.html
@@ -2,7 +2,7 @@
<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>
diff --git a/LayoutTests/media/video-size.html b/LayoutTests/media/video-size.html
index 3e69b2c..c237ff0 100644
--- a/LayoutTests/media/video-size.html
+++ b/LayoutTests/media/video-size.html
@@ -1,8 +1,8 @@
<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 =
diff --git a/LayoutTests/media/video-source-error-no-candidate.html b/LayoutTests/media/video-source-error-no-candidate.html
index 81525bb..d16ea68 100644
--- a/LayoutTests/media/video-source-error-no-candidate.html
+++ b/LayoutTests/media/video-source-error-no-candidate.html
@@ -2,7 +2,7 @@
<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>
diff --git a/LayoutTests/media/video-source-error.html b/LayoutTests/media/video-source-error.html
index f164604..bc56018 100644
--- a/LayoutTests/media/video-source-error.html
+++ b/LayoutTests/media/video-source-error.html
@@ -2,8 +2,8 @@
<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>
diff --git a/LayoutTests/media/video-source-inserted.html b/LayoutTests/media/video-source-inserted.html
index b9d32ff..191aee4 100644
--- a/LayoutTests/media/video-source-inserted.html
+++ b/LayoutTests/media/video-source-inserted.html
@@ -2,7 +2,7 @@
<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>
diff --git a/LayoutTests/media/video-source-media.html b/LayoutTests/media/video-source-media.html
index 2593017..a86625b 100644
--- a/LayoutTests/media/video-source-media.html
+++ b/LayoutTests/media/video-source-media.html
@@ -1,5 +1,5 @@
<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)">
diff --git a/LayoutTests/media/video-source-moved.html b/LayoutTests/media/video-source-moved.html
index ef4da9d..ba5a96c 100644
--- a/LayoutTests/media/video-source-moved.html
+++ b/LayoutTests/media/video-source-moved.html
@@ -2,8 +2,8 @@
<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 =
diff --git a/LayoutTests/media/video-source-none-supported.html b/LayoutTests/media/video-source-none-supported.html
index b0761b3..a3f3b9e 100644
--- a/LayoutTests/media/video-source-none-supported.html
+++ b/LayoutTests/media/video-source-none-supported.html
@@ -2,7 +2,7 @@
<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()
diff --git a/LayoutTests/media/video-source-removed.html b/LayoutTests/media/video-source-removed.html
index cc7d86e..316b0ee 100644
--- a/LayoutTests/media/video-source-removed.html
+++ b/LayoutTests/media/video-source-removed.html
@@ -2,8 +2,8 @@
<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 =
diff --git a/LayoutTests/media/video-source-type-params.html b/LayoutTests/media/video-source-type-params.html
index e92e617..455a479 100644
--- a/LayoutTests/media/video-source-type-params.html
+++ b/LayoutTests/media/video-source-type-params.html
@@ -1,6 +1,6 @@
<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"">
diff --git a/LayoutTests/media/video-source-type.html b/LayoutTests/media/video-source-type.html
index 67fc49b..3488f54 100644
--- a/LayoutTests/media/video-source-type.html
+++ b/LayoutTests/media/video-source-type.html
@@ -3,8 +3,8 @@
<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()
{
diff --git a/LayoutTests/media/video-source.html b/LayoutTests/media/video-source.html
index 54093c8..31038db 100644
--- a/LayoutTests/media/video-source.html
+++ b/LayoutTests/media/video-source.html
@@ -1,7 +1,7 @@
<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()
diff --git a/LayoutTests/media/video-src-change.html b/LayoutTests/media/video-src-change.html
index 511fa6c..b186bd8 100644
--- a/LayoutTests/media/video-src-change.html
+++ b/LayoutTests/media/video-src-change.html
@@ -1,7 +1,7 @@
<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;
diff --git a/LayoutTests/media/video-src-invalid-remove.html b/LayoutTests/media/video-src-invalid-remove.html
index f7cb800..88fe9ff 100644
--- a/LayoutTests/media/video-src-invalid-remove.html
+++ b/LayoutTests/media/video-src-invalid-remove.html
@@ -1,7 +1,7 @@
<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>
diff --git a/LayoutTests/media/video-src-none.html b/LayoutTests/media/video-src-none.html
index b7fa11c..2cc0ee9 100644
--- a/LayoutTests/media/video-src-none.html
+++ b/LayoutTests/media/video-src-none.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script src=../http/tests/media/video-test.js></script>
+ <script src=video-test.js></script>
<script>
var state;
diff --git a/LayoutTests/media/video-src-plus-source.html b/LayoutTests/media/video-src-plus-source.html
index b4744e9..b4740d6 100644
--- a/LayoutTests/media/video-src-plus-source.html
+++ b/LayoutTests/media/video-src-plus-source.html
@@ -1,6 +1,6 @@
<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>
diff --git a/LayoutTests/media/video-src-remove.html b/LayoutTests/media/video-src-remove.html
index c9dfcd8..7efa76a 100644
--- a/LayoutTests/media/video-src-remove.html
+++ b/LayoutTests/media/video-src-remove.html
@@ -1,7 +1,7 @@
<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");
diff --git a/LayoutTests/media/video-src-set.html b/LayoutTests/media/video-src-set.html
index b3dcaf4..b40e0d9 100644
--- a/LayoutTests/media/video-src-set.html
+++ b/LayoutTests/media/video-src-set.html
@@ -1,7 +1,7 @@
<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);
diff --git a/LayoutTests/media/video-src-source.html b/LayoutTests/media/video-src-source.html
index 269eca4..9714fb7 100644
--- a/LayoutTests/media/video-src-source.html
+++ b/LayoutTests/media/video-src-source.html
@@ -1,6 +1,6 @@
<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");
diff --git a/LayoutTests/media/video-src.html b/LayoutTests/media/video-src.html
index 2e38002..bda4c15 100644
--- a/LayoutTests/media/video-src.html
+++ b/LayoutTests/media/video-src.html
@@ -1,7 +1,7 @@
<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()
diff --git a/LayoutTests/http/tests/media/video-test.js b/LayoutTests/media/video-test.js
similarity index 100%
rename from LayoutTests/http/tests/media/video-test.js
rename to LayoutTests/media/video-test.js
diff --git a/LayoutTests/media/video-timeupdate-during-playback.html b/LayoutTests/media/video-timeupdate-during-playback.html
index 04c99bd..13a52de 100644
--- a/LayoutTests/media/video-timeupdate-during-playback.html
+++ b/LayoutTests/media/video-timeupdate-during-playback.html
@@ -6,8 +6,8 @@
<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"));
diff --git a/LayoutTests/media/video-timeupdate-reverse-play.html b/LayoutTests/media/video-timeupdate-reverse-play.html
index a95faa5..eda3127 100644
--- a/LayoutTests/media/video-timeupdate-reverse-play.html
+++ b/LayoutTests/media/video-timeupdate-reverse-play.html
@@ -2,8 +2,8 @@
<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>
diff --git a/LayoutTests/media/video-transformed.html b/LayoutTests/media/video-transformed.html
index f198d2e..3c1a72b 100644
--- a/LayoutTests/media/video-transformed.html
+++ b/LayoutTests/media/video-transformed.html
@@ -1,4 +1,4 @@
-<script src="../http/tests/media/media-file.js"></script>
+<script src="media-file.js"></script>
<script src="video-paint-test.js"></script>
<body>
<style>
diff --git a/LayoutTests/media/video-volume-slider.html b/LayoutTests/media/video-volume-slider.html
index 4d227c1..ca8d7c8 100644
--- a/LayoutTests/media/video-volume-slider.html
+++ b/LayoutTests/media/video-volume-slider.html
@@ -1,7 +1,7 @@
<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;
diff --git a/LayoutTests/media/video-volume.html b/LayoutTests/media/video-volume.html
index 02a31d8..4d871fb 100644
--- a/LayoutTests/media/video-volume.html
+++ b/LayoutTests/media/video-volume.html
@@ -1,7 +1,7 @@
<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");
diff --git a/LayoutTests/media/video-width-height.html b/LayoutTests/media/video-width-height.html
index 094b95e..3b4e831 100644
--- a/LayoutTests/media/video-width-height.html
+++ b/LayoutTests/media/video-width-height.html
@@ -1,5 +1,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);
diff --git a/LayoutTests/media/video-zoom-controls.html b/LayoutTests/media/video-zoom-controls.html
index 812a637..dea9011 100644
--- a/LayoutTests/media/video-zoom-controls.html
+++ b/LayoutTests/media/video-zoom-controls.html
@@ -10,7 +10,7 @@
-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()">
diff --git a/LayoutTests/media/video-zoom.html b/LayoutTests/media/video-zoom.html
index 92a2ebb..8dc86a3 100644
--- a/LayoutTests/media/video-zoom.html
+++ b/LayoutTests/media/video-zoom.html
@@ -1,7 +1,7 @@
<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()
{
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a1c77b1..f217537 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+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 Dirk Pranke <dpranke@chromium.org>
Reviewed by Mihai Parparita.
diff --git a/Tools/Scripts/webkitperl/httpd.pm b/Tools/Scripts/webkitperl/httpd.pm
index b73904d..5795340 100644
--- a/Tools/Scripts/webkitperl/httpd.pm
+++ b/Tools/Scripts/webkitperl/httpd.pm
@@ -94,6 +94,7 @@
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");
@@ -103,6 +104,7 @@
"-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\"",
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py b/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
index 46617f6..188d814 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
@@ -75,6 +75,7 @@
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",
@@ -92,6 +93,7 @@
'-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,
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/http_server.py b/Tools/Scripts/webkitpy/layout_tests/port/http_server.py
index bd75e27..ce2cc1b 100755
--- a/Tools/Scripts/webkitpy/layout_tests/port/http_server.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/http_server.py
@@ -74,9 +74,13 @@
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)
@@ -147,6 +151,10 @@
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:
