2011-02-16 Anna Cavender <annacc@chromium.org>
authormihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Feb 2011 03:41:26 +0000 (03:41 +0000)
committermihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Feb 2011 03:41:26 +0000 (03:41 +0000)
        Reviewed by Mihai Parparita.

        http/tests/media should be served over HTTP (not from local file)
        https://bugs.webkit.org/show_bug.cgi?id=54028

        Removed special file:// treatment of http/tests/media
        Moved media-file.js and video-tests.js to http/tests/media so local server can access them.
        Update tests to point to new location of javascript libraries.

        * http/tests/media/media-file.js: Renamed from LayoutTests/media/media-file.js.
        * 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:
        * http/tests/media/video-test.js: Renamed from LayoutTests/media/video-test.js.
        * 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-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-canvas.html-disabled:
        * 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-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-16  Anna Cavender  <annacc@chromium.org>

        Reviewed by Mihai Parparita.

        http/tests/media should be served over HTTP (not from local file)
        https://bugs.webkit.org/show_bug.cgi?id=54028

        Removed special file:// treatment of http/tests/media

        * Scripts/old-run-webkit-tests:
        * Scripts/webkitpy/layout_tests/port/base.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@78778 268f45cc-cd09-0410-ab3c-d52691b4dbfc

145 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/media/media-file.js [moved from LayoutTests/media/media-file.js with 100% similarity]
LayoutTests/http/tests/media/pdf-served-as-pdf.html
LayoutTests/http/tests/media/reload-after-dialog.html
LayoutTests/http/tests/media/remove-while-loading.html
LayoutTests/http/tests/media/text-served-as-text.html
LayoutTests/http/tests/media/video-buffered.html
LayoutTests/http/tests/media/video-cancel-load.html
LayoutTests/http/tests/media/video-cookie.html
LayoutTests/http/tests/media/video-error-abort.html
LayoutTests/http/tests/media/video-load-twice.html
LayoutTests/http/tests/media/video-play-stall-seek.html
LayoutTests/http/tests/media/video-play-stall.html
LayoutTests/http/tests/media/video-play-suspend.html
LayoutTests/http/tests/media/video-referer.html
LayoutTests/http/tests/media/video-seekable-stall.html
LayoutTests/http/tests/media/video-served-as-text.html
LayoutTests/http/tests/media/video-test.js [moved from LayoutTests/media/video-test.js with 100% similarity]
LayoutTests/media/adopt-node-crash.html
LayoutTests/media/audio-constructor-preload.html
LayoutTests/media/audio-constructor-src.html
LayoutTests/media/audio-constructor.html
LayoutTests/media/audio-controls-rendering.html
LayoutTests/media/audio-data-url.html
LayoutTests/media/audio-delete-while-slider-thumb-clicked.html
LayoutTests/media/audio-delete-while-step-button-clicked.html
LayoutTests/media/audio-mpeg-supported.html
LayoutTests/media/audio-mpeg4-supported.html
LayoutTests/media/audio-play-event.html
LayoutTests/media/before-load-member-access.html
LayoutTests/media/broken-video.html
LayoutTests/media/constructors.html
LayoutTests/media/context-menu-actions.html
LayoutTests/media/controls-after-reload.html
LayoutTests/media/controls-css-overload.html
LayoutTests/media/controls-drag-timebar.html
LayoutTests/media/controls-right-click-on-timebar.html
LayoutTests/media/controls-strict.html
LayoutTests/media/controls-styling.html
LayoutTests/media/controls-without-preload.html
LayoutTests/media/event-attributes.html
LayoutTests/media/invalid-media-url-crash.html
LayoutTests/media/media-can-play-mpeg-audio.html
LayoutTests/media/media-can-play-mpeg4-video.html
LayoutTests/media/media-can-play-octet-stream.html
LayoutTests/media/media-can-play-ogg.html
LayoutTests/media/media-can-play-wav-audio.html
LayoutTests/media/media-captions.html
LayoutTests/media/media-constants.html
LayoutTests/media/media-fullscreen-inline.html
LayoutTests/media/media-fullscreen-not-in-document.html
LayoutTests/media/media-load-event.html
LayoutTests/media/media-startTime.html
LayoutTests/media/remove-from-document-no-load.html
LayoutTests/media/remove-from-document.html
LayoutTests/media/restore-from-page-cache.html
LayoutTests/media/unsupported-rtsp.html
LayoutTests/media/unsupported-tracks.html
LayoutTests/media/video-append-source.html
LayoutTests/media/video-aspect-ratio.html
LayoutTests/media/video-autoplay.html
LayoutTests/media/video-buffered.html
LayoutTests/media/video-can-play-type.html
LayoutTests/media/video-canvas-alpha.html
LayoutTests/media/video-canvas-source.html
LayoutTests/media/video-canvas.html-disabled
LayoutTests/media/video-click-dblckick-standalone.html
LayoutTests/media/video-controls-rendering.html
LayoutTests/media/video-controls-transformed.html
LayoutTests/media/video-controls-visible-audio-only.html
LayoutTests/media/video-controls-zoomed.html
LayoutTests/media/video-controls.html
LayoutTests/media/video-currentTime-delay.html
LayoutTests/media/video-currentTime-set.html
LayoutTests/media/video-currentTime-set2.html
LayoutTests/media/video-currentTime.html
LayoutTests/media/video-delay-load-event.html
LayoutTests/media/video-display-aspect-ratio.html
LayoutTests/media/video-display-none-crash.html
LayoutTests/media/video-display-toggle.html
LayoutTests/media/video-does-not-loop.html
LayoutTests/media/video-dom-autoplay.html
LayoutTests/media/video-dom-preload.html
LayoutTests/media/video-dom-src.html
LayoutTests/media/video-duration-known-after-eos.html
LayoutTests/media/video-error-does-not-exist.html
LayoutTests/media/video-frame-accurate-seek.html
LayoutTests/media/video-layer-crash.html
LayoutTests/media/video-load-networkState.html
LayoutTests/media/video-load-readyState.html
LayoutTests/media/video-loop.html
LayoutTests/media/video-muted.html
LayoutTests/media/video-no-audio.html
LayoutTests/media/video-no-autoplay.html
LayoutTests/media/video-pause-empty-events.html
LayoutTests/media/video-pause-immediately.html
LayoutTests/media/video-play-empty-events.html
LayoutTests/media/video-play-pause-events.html
LayoutTests/media/video-play-pause-exception.html
LayoutTests/media/video-played-collapse.html
LayoutTests/media/video-played-ranges-1.html
LayoutTests/media/video-played-reset.html
LayoutTests/media/video-poster-delayed.html
LayoutTests/media/video-poster-scale.html
LayoutTests/media/video-poster.html
LayoutTests/media/video-preload.html
LayoutTests/media/video-replaces-poster.html
LayoutTests/media/video-reverse-play-duration.html
LayoutTests/media/video-seek-by-small-increment.html
LayoutTests/media/video-seek-no-src-exception.html
LayoutTests/media/video-seek-past-end-paused.html
LayoutTests/media/video-seek-past-end-playing.html
LayoutTests/media/video-seekable.html
LayoutTests/media/video-seeking.html
LayoutTests/media/video-size-intrinsic-scale.html
LayoutTests/media/video-size.html
LayoutTests/media/video-source-error-no-candidate.html
LayoutTests/media/video-source-error.html
LayoutTests/media/video-source-inserted.html
LayoutTests/media/video-source-media.html
LayoutTests/media/video-source-moved.html
LayoutTests/media/video-source-none-supported.html
LayoutTests/media/video-source-removed.html
LayoutTests/media/video-source-type-params.html
LayoutTests/media/video-source-type.html
LayoutTests/media/video-source.html
LayoutTests/media/video-src-change.html
LayoutTests/media/video-src-invalid-remove.html
LayoutTests/media/video-src-none.html
LayoutTests/media/video-src-plus-source.html
LayoutTests/media/video-src-remove.html
LayoutTests/media/video-src-set.html
LayoutTests/media/video-src-source.html
LayoutTests/media/video-src.html
LayoutTests/media/video-timeupdate-during-playback.html
LayoutTests/media/video-timeupdate-reverse-play.html
LayoutTests/media/video-transformed.html
LayoutTests/media/video-volume-slider.html
LayoutTests/media/video-volume.html
LayoutTests/media/video-width-height.html
LayoutTests/media/video-zoom-controls.html
LayoutTests/media/video-zoom.html
Tools/ChangeLog
Tools/Scripts/old-run-webkit-tests
Tools/Scripts/webkitpy/layout_tests/port/base.py

index d983e60..c4999e7 100644 (file)
@@ -1,3 +1,156 @@
+2011-02-16  Anna Cavender  <annacc@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        http/tests/media should be served over HTTP (not from local file)
+        https://bugs.webkit.org/show_bug.cgi?id=54028
+
+        Removed special file:// treatment of http/tests/media
+        Moved media-file.js and video-tests.js to http/tests/media so local server can access them.
+        Update tests to point to new location of javascript libraries.
+
+        * http/tests/media/media-file.js: Renamed from LayoutTests/media/media-file.js.
+        * 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:
+        * http/tests/media/video-test.js: Renamed from LayoutTests/media/video-test.js.        
+        * 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-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-canvas.html-disabled:
+        * 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-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-16  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Daniel Bates.
index 5709ef8..69dfc51 100644 (file)
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>PDF file served as 'application/pdf'</title>
-        <script src=../../../media/video-test.js></script>
+        <script src=video-test.js></script>
         <script>
             function loadedmetadata(evt) 
             {
index fe8e2c2..943b026 100644 (file)
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src=../../../media/media-file.js></script>
-        <script src=../../../media/video-test.js></script>
+        <script src=media-file.js></script>
+        <script src=video-test.js></script>
         <script>
             var loadCount = 0;
 
index 0ea6a60..b7aea82 100644 (file)
@@ -1,6 +1,6 @@
 <video></video>
 <p>Test that removing a media element from the tree while loading does not crash.</p>
-<script src=../../../media/video-test.js></script>
+<script src=video-test.js></script>
 <script>
 waitForEvent('loadedmetadata', function () {
     run("document.body.removeChild(video)");
index 0ec31fc..5975205 100644 (file)
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>text file served as 'text/plain'</title>
-        <script src=../../../media/video-test.js></script>
+        <script src=video-test.js></script>
         <script>
             function loadedmetadata(evt) 
             {
index e958edf..9eb75a0 100644 (file)
@@ -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=../../../media/video-test.js></script>
-<script src=../../../media/media-file.js></script>
+<script src=video-test.js></script>
+<script src=media-file.js></script>
 <script>
     function delayedSeek() {
         testExpected("video.buffered.length", 1, "==");
index 1b7054f..08f504b 100644 (file)
@@ -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/media-file.js></script>
-  <script src=../../../media/video-test.js></script>
+  <script src=media-file.js></script>
+  <script src=video-test.js></script>
   <video controls id="video"></video>
 
   <textarea id="child_content" style="display: none;">
index 8d5408d..cb0f43c 100644 (file)
@@ -3,8 +3,8 @@
 </head>
 <body onload="loadCookie()">
 <video id="video"></video>
-<script src=../../../media/video-test.js></script>
-<script src=../../../media/media-file.js></script>
+<script src=video-test.js></script>
+<script src=media-file.js></script>
 <script>
     if (window.layoutTestController) {
         layoutTestController.dumpAsText();
index 79d35c5..b64c869 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>'abort' event test</title>
-        <script src=../../../media/media-file.js></script>
-        <script src=../../../media/video-test.js></script>
+        <script src=media-file.js></script>
+        <script src=video-test.js></script>
         <script>
             var didLoad = false;
 
index 0337035..165ec3c 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <head>
-<script src=../../../media/media-file.js></script>
-<script src=../../../media/video-test.js></script>
+<script src=media-file.js></script>
+<script src=video-test.js></script>
 <script>
     var file = findMediaFile("video", "http://127.0.0.1:8000/resources/test");
 
index 24a103e..03d8744 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
 <p>Test that playback can be resumed by seeking backwards after load stalls.</p>
-<script src=../../../media/video-test.js></script>
+<script src=video-test.js></script>
 <script>
 
     var waitingCount = 0;
index 4dbecda..969ec22 100644 (file)
@@ -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=../../../media/video-test.js></script>
+<script src=video-test.js></script>
 <script>
 
     var timeupdateCount = 0;
index bc25c1d..5789e73 100644 (file)
@@ -1,7 +1,7 @@
 <html>
   <head>
-      <script src=../../../media/media-file.js></script>
-      <script src=../../../media/video-test.js></script>
+      <script src=media-file.js></script>
+      <script src=video-test.js></script>
       <script>
           function start() {
               findMediaElement();
index 5876e77..7953c60 100644 (file)
@@ -3,8 +3,8 @@
 </head>
 <body onload="loadCookieAndReferer()">
 <video id="video"></video>
-<script src=../../../media/video-test.js></script>
-<script src=../../../media/media-file.js></script>
+<script src=video-test.js></script>
+<script src=media-file.js></script>
 <script>
     if (window.layoutTestController) {
         layoutTestController.setAlwaysAcceptCookies(true);
index fac6d0a..9326e2a 100644 (file)
@@ -1,6 +1,6 @@
 <video></video>
 <p>Test seekable range when video load is incomplete.</p>
-<script src=../../../media/video-test.js></script>
+<script src=video-test.js></script>
 <script>
 waitForEvent('canplay', function () {
     test("video.seekable");
index c1d9a66..69ef325 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>media file served as 'text/plain'</title>
-        <script src=../../../media/media-file.js></script>
-        <script src=../../../media/video-test.js></script>
+        <script src=media-file.js></script>
+        <script src=video-test.js></script>
         <script>
             function loadedmetadata(evt) 
             {
index 993a14d..4f3e861 100644 (file)
@@ -2,7 +2,7 @@
 
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
 
         <script>
 
index d3a104f..da582b9 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index 078f905..b9eb336 100644 (file)
@@ -1,7 +1,7 @@
 <body>
 <p>Test that Audio("url") constructor loads the specified resource.</p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     var audioFile = findMediaFile("audio", "content/test");
     var audio = new Audio(audioFile);
index 5c13e26..00971e0 100644 (file)
@@ -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=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 
 <script>
     var audio = new Audio();
index 43e0c1d..d75410b 100644 (file)
@@ -3,7 +3,7 @@
         <style>
             audio { background-color: blue; } 
         </style>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             function test()
             {
index 9dd2b37..8386769 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
         
index 97866c9..5ef8d7e 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             if (window.layoutTestController) {
                 layoutTestController.dumpAsText();
index d087d5c..0aa7896 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             if (window.layoutTestController) {
                 layoutTestController.dumpAsText();
index 1407f6d..0ec2887 100644 (file)
@@ -5,7 +5,7 @@
 
     <audio controls></audio>
     
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         var timeupdateEventCount = 0;
         mediaElement = document.getElementsByTagName('audio')[0];
index bab7f65..270d5c3 100644 (file)
@@ -5,7 +5,7 @@
 
     <audio controls></audio>
     
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         var timeupdateEventCount = 0;
         mediaElement = document.getElementsByTagName('audio')[0];
index 315df8e..596a205 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>'play' event</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
             function start()
index 58866a5..f2671d5 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
         <title>Test that accessing member of a non loaded video works.</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
         function test()
         {
index 3aa8424..40234aa 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test that QuickTime file with broken content generates an error.<p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 
 <script>
     video.src = findMediaFile("video", "content/garbage");
index 61125ee..3c844af 100644 (file)
@@ -2,7 +2,7 @@
 <p>Test that media constructors behave consistently.</p>
 <video></video>
 <audio></audio>
-<script src=video-test.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     var audioJS = new Audio();
     var videoElem = document.getElementsByTagName('video')[0];
index ae80f14..993bd60 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <head>
-        <script src="media-file.js"></script>
-        <script src=video-test.js></script>
+        <script src="../http/tests/media/media-file.js"></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
 
             function playing()
index 4998235..b0c7def 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src=media-file.js></script>
+    <script src=../http/tests/media/media-file.js></script>
     <script>
     var video;
     var loadedCount = 0;
index 8ac44b5..5b680f5 100644 (file)
@@ -12,7 +12,7 @@
                 display:none;
             }
         </style>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
 </head>
 <body>
     <video class="nocontrols" width=300 height=200 controls></video>
index ea2416a..402388f 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>drag timebar test</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var x;
             var y;
index fad0373..0e24234 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>right click on timebar test</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             if (window.layoutTestController)
                 layoutTestController.dumpAsText();
index de5b4de..88560aa 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
     <head>
-        <script src="media-file.js"></script>
+        <script src="../http/tests/media/media-file.js"></script>
         <script src="video-paint-test.js"></script>
     </head>
     <body onload="setSrcByTagName('video', findMediaFile('video', 'content/test')); init()">
index 453ae46..e3f0a11 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="media-file.js"></script>
+    <script src="../http/tests/media/media-file.js"></script>
     <script src="video-paint-test.js"></script>
     <style>
     .override {
index 95b3531..3eb35e7 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             if (window.layoutTestController)
                 layoutTestController.waitUntilDone();
index bc9610a..10d092d 100644 (file)
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var ratechangeCount = 0;
             var playingCount = 0;
index 73f9be6..b66bbad 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <body>
         <p>Tests that invalid media src url does not result in crash.</p>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var invalid_url = "http:aa" + String.fromCharCode(0) + "%aa#aa";
             var error_count = 0;
index 9889469..32355d5 100644 (file)
@@ -3,7 +3,7 @@
         <style>
             video { background-color: yellow; width: 320px; height: 240px;}
         </style>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             function start()
             {
index 7a9e67f..c96325b 100644 (file)
@@ -3,7 +3,7 @@
         <style>
             video { background-color: yellow; width: 320px; height: 240px;}
         </style>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             function start()
             {
index bc6fc39..e5a76b5 100644 (file)
@@ -5,7 +5,7 @@
         <style>
             video { background-color: yellow; width: 320px; height: 240px;}
         </style>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             function test()
             {
index 4ac9aa7..885a987 100644 (file)
@@ -10,7 +10,7 @@
 
         <p>Test HTMLMediaElement <em>canPlayType()</em> method for ogg media containers.</p>
 
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             video = mediaElement = document.getElementsByTagName('video')[0];
 
index 94adeda..750961c 100644 (file)
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             function start()
             {
index b2f4565..9361ee4 100644 (file)
@@ -3,7 +3,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>closed caption API test</title>
 
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src=media-fullscreen.js></script>
 
         <script>
index b4ad1a6..f30d173 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script type="text/javascript">
         function doTest () 
         {
index 571ec81..fd7008b 100644 (file)
@@ -3,7 +3,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>inline &lt;video&gt; element fullscreen test</title>
 
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src=media-fullscreen.js></script>
 
         <script>
index dbb5bee..db01f48 100644 (file)
@@ -3,7 +3,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>not in document &lt;video&gt; element fullscreen test</title>
 
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src=media-fullscreen.js></script>
         <script>
             var movieInfo = 
index e8382bd..ad3a31e 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index afe21eb..172633a 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>startTime attribute test</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
             function loadeddata()
index 1cb37bb..76ff145 100644 (file)
@@ -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=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     didReceiveLoadStartEvent = false;
     video.addEventListener('loadstart', function() { didReceiveLoadStartEvent = true; });
index d95f6aa..131991f 100644 (file)
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script type="text/javascript" charset="utf-8">
         function doSetup()
         {
index a125e42..47cc82b 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var mediaFile = findMediaFile("video", "content/test");
             var loadCount = 0;
index bea9820..6247573 100644 (file)
@@ -3,7 +3,7 @@
 
 <p>Test that QuickTime file with RTSP URL generates a load error.<p>
 
-<script src=video-test.js></script>
+<script src=../http/tests/media/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 () {
index 57d05c9..fbe9a27 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test that QuickTime file with unsupported track types only generates an error.<p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
 video.src = findMediaFile("video", "content/unsupported_track");
 waitForEvent("error", function () {
index 00b79ef..7de73f5 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 
 <script>
     testExpected("video.currentSrc", "");
index ffd95a9..3b260d4 100644 (file)
@@ -1,4 +1,4 @@
-<script src="media-file.js"></script>
+<script src="../http/tests/media/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>
index e1d8ba2..075cee9 100644 (file)
@@ -1,6 +1,6 @@
 <video autoplay controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 
 <script>
     testExpected("video.autoplay", true);
index 2885fd4..8d94a8d 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.buffered.length", 0);
     testException("video.buffered.start(-1)", "DOMException.INDEX_SIZE_ERR");
index 873381d..7fe0d56 100644 (file)
@@ -10,7 +10,7 @@
 
         <p>Test HTMLMediaElement <em>canPlayType()</em> method.</p>
 
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
         
             video = mediaElement = document.getElementsByTagName('video')[0];
index 9001ae1..26a4087 100644 (file)
@@ -1,6 +1,6 @@
 <html>
  <head>
-  <script src="media-file.js"></script>
+  <script src="../http/tests/media/media-file.js"></script>
 
   <script>
     if (window.layoutTestController) {
index 1b3efd7..d93ea5a 100644 (file)
@@ -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=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src="../fast/js/resources/js-test-pre.js"></script>
         <script>
             var ctx;
index 39ad495..b160f63 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
         <title>drawing &lt;video&gt; to &lt;canvas&gt;</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
             var ctx;
index 7a13e43..578aa16 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
         if (window.layoutTestController) {
             layoutTestController.dumpAsText();
index 0ef5084..3e2e252 100644 (file)
@@ -1,4 +1,4 @@
-<script src="media-file.js"></script>
+<script src="../http/tests/media/media-file.js"></script>
 <script src="video-paint-test.js"></script>
 <body>
 <p>Test controls placement. </p>
index e3ff120..552df33 100644 (file)
@@ -12,8 +12,8 @@
     <video controls></video>
     <p>Test controls on transformed video.</p>
     <p>This test only runs in DRT!</p>
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         testExpected("video.controls", null, '!=');
         waitForEvent('canplaythrough', function () {
index 826d359..5b49e9b 100644 (file)
@@ -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=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             if (window.layoutTestController) {
                 layoutTestController.dumpAsText();
index 5325248..9995e2a 100644 (file)
@@ -6,7 +6,7 @@
       margin: 50px;
     }
   </style>
-  <script src=media-file.js></script>
+  <script src=../http/tests/media/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=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         testExpected("video.controls", null, '!=');
         waitForEvent('canplaythrough', function() {
index 6d596a4..59b6f06 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test 'controls' attribute<p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.controls", null, '!=');
     waitForEvent('canplaythrough', function () {
index 91ce631..9edda7e 100644 (file)
@@ -5,8 +5,8 @@
     
     <p>Test a delay in playing the movie results in a canPlay event.</p>
     
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
     waitForEvent('canplaythrough',  
     function () { 
index 688081c..4294259 100644 (file)
@@ -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=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
     waitForEvent('canplaythrough',  
     function () { 
index 8221cca..7ad24d2 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     waitForEvent('canplaythrough',  
     function () { 
index f0f2a45..04068cb 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.currentTime", 0)
     waitForEvent('canplaythrough', function() { testExpected("video.currentTime", 0); } );
index ae5e11c..4c84e85 100644 (file)
@@ -3,8 +3,8 @@
     <head>
         <title>delay document 'load' event test</title>
         <style> video { border: 3px solid red; } </style>
-        <script src=video-test.js></script>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             var video;
 
index b66da18..7abd61a 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.videoWidth", 0, "==");
     testExpected("video.videoHeight", 0, "==");
index 4f66c1c..6ec1bbe 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test that pause() after changing display to "none" doesn't cause a crash.</p>
-<script src="media-file.js"></script>
-<script src="video-test.js"></script>
+<script src="../http/tests/media/media-file.js"></script>
+<script src="../http/tests/media/video-test.js"></script>
 <script>
     video.src = findMediaFile("video", "content/test");
     video.play();
index e3f9cd8..289b216 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             function toggleDisplay()
             {
index 3a30d74..6433c5a 100644 (file)
@@ -2,7 +2,7 @@
 <html>
     <head>
         <style> video { height: 25px; width: 300px; } </style>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
     
         <script>
             var seekCount = 0;
index 12fa569..9bf1463 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.autoplay", false);
     video.autoplay = true;
index 02f79de..aca3c50 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             function setPreload(value, expected)
             {
index 0abdf7e..b563eed 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.currentSrc", "");
     var mediaFile = findMediaFile("video", "content/test");
index 9efa0f3..f671855 100644 (file)
@@ -4,8 +4,8 @@
     <head>
         <title>local video</title>
 
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
             function ended()
index 35015bc..d567c6e 100644 (file)
@@ -1,6 +1,6 @@
 <p>Test that the media element is in correct state after load fails.</p>
 <video controls></video>
-<script src=video-test.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
 
     consoleWrite("");
index 07c936a..0425a7d 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="media-file.js"></script>
+        <script src="../http/tests/media/media-file.js"></script>
         <script src="video-paint-test.js"></script>
     </head>
     <body onload="setSrcByTagName('video', findMediaFile('video', 'content/test-25fps')); init()">
index b5844d6..5e2dba3 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src="media-file.js"></script>
+        <script src="../http/tests/media/media-file.js"></script>
         <script src="video-paint-test.js"></script>
         <style>
             video { width:200px; border: 3px solid red; -webkit-box-reflect: below 5px; }
index eee64ac..e198317 100644 (file)
@@ -8,8 +8,8 @@
     events and end up with networkState >= NETWORK_LOADING.
      </p>
     
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         function testNetworkState(expected, endit, op)
         {
index d0402ac..a7bec95 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     function testReadyState(expected, endit, op)
     {
index f37cd68..7ad940e 100644 (file)
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
     
         <script>
             var seekCount = 0;
index 431f8cd..2e1940f 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test 'muted' attribute<p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.muted", false);
     run("video.muted = true");
index f411e15..fb79b5c 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             if (window.layoutTestController)
                 layoutTestController.waitUntilDone();
index 38920ce..7fc4e59 100644 (file)
@@ -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=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.paused", true);
 
index 9c157db..e9093a0 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test that pause() from EMPTY network state triggers load()</p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     video.src = findMediaFile("video", "content/test");
     testExpected("video.networkState", HTMLMediaElement.NETWORK_NO_SOURCE);
index aa36036..159f63f 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>Test pause() pauses the clock immediately</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var timeAfterPause;
 
index dea1480..8d1abfb 100644 (file)
@@ -3,8 +3,8 @@
 
     <video controls></video>
     <p>Test that play() from EMPTY network state triggers load() and async play event.</p>
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         testExpected("video.networkState", HTMLMediaElement.NETWORK_EMPTY);
     
index 87ec781..0dd2e33 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test that calling play() and pause() triggers async play, timeupdate and pause events.</p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     video.src = findMediaFile("video", "content/test.mp4");
 
index de62401..2f6f86e 100644 (file)
@@ -4,7 +4,7 @@
 
 <p>Video has no src. Test that the playing event is not dispatched.</p>
 
-<script src=video-test.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     waitForEventAndFail('playing');
 
index 5e81fb4..3280ed2 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>Test of 'played' attribute</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src=video-played.js></script>
         <script>
     
index 8013160..58e3a59 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>Test of 'played' attribute</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src=video-played.js></script>
         <script>
     
index dbc25e6..72da054 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>Test of 'played' attribute</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script src=video-played.js></script>
         <script>
     
index ac74f23..77f6431 100644 (file)
@@ -3,8 +3,8 @@
 <html>
     <head>
         <title>Delayed load of poster should not overwrite intrinsic size of video</title>
-        <script src=video-test.js></script>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <style>
             video {
                 border: 3px solid red;
index f87507d..9866c70 100644 (file)
@@ -3,7 +3,7 @@
 <html>
     <head>
         <title>'poster' aspect ratio test</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <style> 
             video { 
                 border: 3px solid red; 
index 188cf2d..64e655d 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
         <title>&lt;video&gt; element with poster size test</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var posterInfo = 
             {
index e264b88..3e8f79f 100644 (file)
@@ -2,8 +2,8 @@
 
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
             var timer = null;
index b99055e..f628ec1 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
     <script src="video-paint-test.js"></script>
-    <script src="media-file.js"></script>
+    <script src="../http/tests/media/media-file.js"></script>
     <script type="text/javascript" charset="utf-8">
         function doSetup()
         {
index a43c53d..63e4fb3 100644 (file)
@@ -4,8 +4,8 @@
     <head>
         <title>local video</title>
 
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index 12aa8dd..73bce9e 100644 (file)
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
             var seekedEventCount = 0;
index 7d304ae..cf0aacc 100644 (file)
@@ -5,7 +5,7 @@
     
     <p>Test that seeking video with no 'src' attribute throws an INVALID_STATE_ERR exception.</p>
 
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         testExpected("video.networkState", HTMLMediaElement.NETWORK_EMPTY);
         testExpected("video.readyState", HTMLMediaElement.HAVE_NOTHING);
index e9c784e..b5d6b54 100644 (file)
@@ -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=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
 
     waitForEvent('canplaythrough', function () { 
index 9191d3b..eb36a96 100644 (file)
@@ -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=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     var timeupdateEventCount = 0;
 
index d7366a8..797a1e2 100644 (file)
@@ -1,6 +1,6 @@
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.seekable.length", 0);
     testException("video.seekable.start(-1)", "DOMException.INDEX_SIZE_ERR");
index a8c6b5a..a38d3ef 100644 (file)
@@ -3,8 +3,8 @@
  goes back to false when seeking completes, and that a 'seeked' event
  is fired for each seek
  </p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
 
     var seekedCount = 0;
index 22eb4cb..cdd5290 100644 (file)
@@ -2,7 +2,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>&lt;video&gt; element intrinsic size test</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index c237ff0..3e69b2c 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>&lt;video&gt; element size and resize test</title>
-        <script src=video-test.js></script>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
 
         <script>
             var movieInfo = 
index d16ea68..81525bb 100644 (file)
@@ -2,7 +2,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>&lt;video&gt; and &lt;source&gt; error test</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index bc56018..f164604 100644 (file)
@@ -2,8 +2,8 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>&lt;video&gt; and &lt;source&gt; error test</title>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index 191aee4..b9d32ff 100644 (file)
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>networkState after inserting &lt;source&gt; test</title>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
     </head>
     <body>
         <video controls><source></video>
index a86625b..2593017 100644 (file)
@@ -1,5 +1,5 @@
 <body>
-<script src=video-test.js></script>
+<script src=../http/tests/media/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)">
index ba5a96c..ef4da9d 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>moving &lt;source&gt; element test</title>
-        <script src=video-test.js></script>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
 
             var testInfo = 
index a3f3b9e..b0761b3 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>no usable &lt;source&gt; test</title>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
 
         function setup()
index 316b0ee..cc7d86e 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>crash after removing &lt;source&gt; test</title>
-        <script src=video-test.js></script>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
 
             var testInfo = 
index 455a479..e92e617 100644 (file)
@@ -1,6 +1,6 @@
 <body>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <video controls>
     <source src=content/bogus.mpeg type="video/blahblah">
     <source src=content/test.mp4 type="video/mpeg; codecs=&quot;avc1.4D400C&quot;">
index 3488f54..67fc49b 100644 (file)
@@ -3,8 +3,8 @@
 <head>
     <title> &lt;source&gt; @type attribute</title>
 
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         function setup()
         {
index 31038db..54093c8 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
 
             function test()
index b186bd8..511fa6c 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=video-test.js></script>
-        <script src=media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
         <script>
             var mediaFile;
             var loadedCount = 0;
index 88fe9ff..f7cb800 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         
         <script>
index 2cc0ee9..b7fa11c 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
             var state;
 
index b4740d6..b4744e9 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <body>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/video-test.js></script>
 
     <video src=content/bogus.mpeg controls>
         <source src=content/test.mp4>
index 7efa76a..c9dfcd8 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <body>
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <div id=panel></div>
     <script>
         var panel = document.getElementById("panel");
index b40e0d9..b3dcaf4 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <div>Test that setting src attribute triggers load</div>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     var mediaFile = findMediaFile("video", "content/test");
     video.setAttribute('src', mediaFile);
index 9714fb7..269eca4 100644 (file)
@@ -1,6 +1,6 @@
 <body>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <div id=panel></div>
 <script>
     var panel = document.getElementById("panel");
index bda4c15..2e38002 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
         <script>
 
             function test()
index 13a52de..04c99bd 100644 (file)
@@ -6,8 +6,8 @@
     <p>
     Test 'timeupdate' events are posted while playing but not while paused.
     </p>
-    <script src=media-file.js></script>
-    <script src=video-test.js></script>
+    <script src=../http/tests/media/media-file.js></script>
+    <script src=../http/tests/media/video-test.js></script>
     <script>
         setSrcByTagName("video", findMediaFile("video", "content/test"));
     
index eda3127..a95faa5 100644 (file)
@@ -2,8 +2,8 @@
 
 <html>
     <head>
-        <script src=media-file.js></script>
-        <script src=video-test.js></script>
+        <script src=../http/tests/media/media-file.js></script>
+        <script src=../http/tests/media/video-test.js></script>
 
         <script>
 
index 3c1a72b..f198d2e 100644 (file)
@@ -1,4 +1,4 @@
-<script src="media-file.js"></script>
+<script src="../http/tests/media/media-file.js"></script>
 <script src="video-paint-test.js"></script>
 <body>
 <style>
index ca8d7c8..4d227c1 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Test rendering of volume slider of video tag</title>
-    <script src=media-file.js></script>
+    <script src=../http/tests/media/media-file.js></script>
     <script>
         var video;
 
index 4d871fb..02a31d8 100644 (file)
@@ -1,7 +1,7 @@
 <video controls></video>
 <p>Test 'volume' attribute<p>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../http/tests/media/media-file.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.volume", 1.0);
     run("video.volume = 0.5");
index 3b4e831..094b95e 100644 (file)
@@ -1,5 +1,5 @@
 <video width=100 height=50 controls></video>
-<script src=video-test.js></script>
+<script src=../http/tests/media/video-test.js></script>
 <script>
     testExpected("video.width", 100);
     testExpected("video.height", 50);
index dea9011..812a637 100644 (file)
@@ -10,7 +10,7 @@
         -webkit-transform: rotate(10deg);
       }
     </style>
-    <script src="media-file.js"></script>
+    <script src="../http/tests/media/media-file.js"></script>
     <script src="video-paint-test.js"></script>
 </head>
 <body onload="setSrcByTagName('video', findMediaFile('video', 'content/test')); init()">
index 8dc86a3..92a2ebb 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <head>
     <style> video { zoom: 150%; border: 3px solid red; } </style>
-    <script src=media-file.js></script>
+    <script src=../http/tests/media/media-file.js></script>
     <script>
         function init()
         {
index daaed9a..17c6654 100644 (file)
@@ -1,3 +1,15 @@
+2011-02-16  Anna Cavender  <annacc@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        http/tests/media should be served over HTTP (not from local file)
+        https://bugs.webkit.org/show_bug.cgi?id=54028
+
+        Removed special file:// treatment of http/tests/media
+
+        * Scripts/old-run-webkit-tests:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+
 2011-02-16  Mihai Parparita  <mihaip@chromium.org>
 
         Reviewed by Ojan Vafai.
index c56cb1c..33c7a72 100755 (executable)
@@ -766,7 +766,7 @@ for my $test (@tests) {
                     print OUT "$errorMessagePath\n";
                 }
             }
-        } elsif ($test !~ /^http\/tests\/local\// && $test !~ /^http\/tests\/ssl\// && $test !~ /^http\/tests\/wml\// && $test !~ /^http\/tests\/media\//) {
+        } elsif ($test !~ /^http\/tests\/local\// && $test !~ /^http\/tests\/ssl\// && $test !~ /^http\/tests\/wml\//) {
             my $path = canonpath($test);
             $path =~ s/^http\/tests\///;
             print OUT "http://127.0.0.1:$httpdPort/$path$suffixExpectedHash\n";
index 91113e2..de9d8f0 100644 (file)
@@ -356,9 +356,8 @@ class Port(object):
         # Make http/tests/local run as local files. This is to mimic the
         # logic in run-webkit-tests.
         #
-        # TODO(dpranke): remove the media reference and the SSL reference?
-        if (port and not relative_path.startswith("local/") and
-            not relative_path.startswith("media/")):
+        # TODO(dpranke): remove the SSL reference?
+        if (port and not relative_path.startswith("local/")):
             if relative_path.startswith("ssl/"):
                 port += 443
                 protocol = "https"