2011-02-24 Victoria Kirst <vrk@google.com>
authormihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Feb 2011 19:42:54 +0000 (19:42 +0000)
committermihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Feb 2011 19:42:54 +0000 (19:42 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@79598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

147 files changed:
LayoutTests/ChangeLog
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/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-file.js [moved from LayoutTests/http/tests/media/media-file.js with 100% similarity]
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-click-dblckick-standalone.html
LayoutTests/media/video-controls-in-media-document.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-plays-past-end-of-test.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-test.js [moved from LayoutTests/http/tests/media/video-test.js with 100% similarity]
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/webkitperl/httpd.pm
Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
Tools/Scripts/webkitpy/layout_tests/port/http_server.py

index f36f7cd..0259137 100644 (file)
@@ -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  Anna Cavender  <annacc@chromium.org>
 
         Reviewed by Ojan Vafai.
index 69dfc51..e19c1a4 100644 (file)
@@ -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) 
             {
index 943b026..87f6eff 100644 (file)
@@ -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;
 
index b7aea82..5015b38 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=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
 <script>
 waitForEvent('loadedmetadata', function () {
     run("document.body.removeChild(video)");
index 5975205..7c02db4 100644 (file)
@@ -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) 
             {
index 9eb75a0..105ca94 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=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, "==");
index 08f504b..885ce45 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-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;">
index cb0f43c..06defa2 100644 (file)
@@ -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();
index b64c869..192e405 100644 (file)
@@ -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;
 
index 165ec3c..3c39047 100644 (file)
@@ -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");
 
index 03d8744..82acd62 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=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
 <script>
 
     var waitingCount = 0;
index 969ec22..af54811 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=video-test.js></script>
+<script src=../../media-resources/video-test.js></script>
 <script>
 
     var timeupdateCount = 0;
index 5789e73..092e907 100644 (file)
@@ -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();
index 7953c60..e6e9f79 100644 (file)
@@ -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);
index 9326e2a..ad47d05 100644 (file)
@@ -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");
index 69ef325..4c00cb3 100644 (file)
@@ -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) 
             {
index 4f3e861..993a14d 100644 (file)
@@ -2,7 +2,7 @@
 
 <html>
     <head>
-        <script src=../http/tests/media/media-file.js></script>
+        <script src=media-file.js></script>
 
         <script>
 
index da582b9..d3a104f 100644 (file)
@@ -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>
 
index b9eb336..078f905 100644 (file)
@@ -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);
index 00971e0..5c13e26 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=../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();
index d75410b..43e0c1d 100644 (file)
@@ -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()
             {
index 8386769..9dd2b37 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
 
         <script>
         
index 9ade2c2..6345ce5 100644 (file)
@@ -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();
index 0aa7896..d087d5c 100644 (file)
@@ -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();
index 0ec2887..1407f6d 100644 (file)
@@ -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];
index 270d5c3..bab7f65 100644 (file)
@@ -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];
index 596a205..315df8e 100644 (file)
@@ -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()
index f2671d5..58866a5 100644 (file)
@@ -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()
         {
index 40234aa..3aa8424 100644 (file)
@@ -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");
index 3c844af..61125ee 100644 (file)
@@ -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];
index 993bd60..ae80f14 100644 (file)
@@ -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()
index b0c7def..4998235 100644 (file)
@@ -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;
index 5b680f5..8ac44b5 100644 (file)
@@ -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>
index 402388f..ea2416a 100644 (file)
@@ -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;
index 0e24234..fad0373 100644 (file)
@@ -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();
index 88560aa..de5b4de 100644 (file)
@@ -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()">
index e3f0a11..453ae46 100644 (file)
@@ -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 {
index 3eb35e7..95b3531 100644 (file)
@@ -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();
index 10d092d..bc9610a 100644 (file)
@@ -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;
index b66bbad..73f9be6 100644 (file)
@@ -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;
index 32355d5..9889469 100644 (file)
@@ -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()
             {
index c96325b..7a9e67f 100644 (file)
@@ -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()
             {
index e5a76b5..bc6fc39 100644 (file)
@@ -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()
             {
index 885a987..4ac9aa7 100644 (file)
@@ -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];
 
index 750961c..94adeda 100644 (file)
@@ -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()
             {
index 9361ee4..b2f4565 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=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
         <script src=media-fullscreen.js></script>
 
         <script>
index f30d173..b4ad1a6 100644 (file)
@@ -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 () 
         {
index fd7008b..571ec81 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=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
         <script src=media-fullscreen.js></script>
 
         <script>
index db01f48..dbb5bee 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=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
         <script src=media-fullscreen.js></script>
         <script>
             var movieInfo = 
index ad3a31e..e8382bd 100644 (file)
@@ -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>
 
index 172633a..afe21eb 100644 (file)
@@ -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()
index 76ff145..1cb37bb 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=../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; });
index 131991f..d95f6aa 100644 (file)
@@ -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()
         {
index 47cc82b..a125e42 100644 (file)
@@ -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;
index 6247573..bea9820 100644 (file)
@@ -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 () {
index fbe9a27..57d05c9 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=../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 () {
index 7de73f5..00b79ef 100644 (file)
@@ -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", "");
index 3b260d4..ffd95a9 100644 (file)
@@ -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>
index 075cee9..e1d8ba2 100644 (file)
@@ -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);
index 8d94a8d..2885fd4 100644 (file)
@@ -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");
index 7fe0d56..873381d 100644 (file)
@@ -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];
index 26a4087..9001ae1 100644 (file)
@@ -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) {
index d93ea5a..1b3efd7 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=../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;
index 578aa16..7a13e43 100644 (file)
@@ -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();
index ea20186..0ba5c43 100644 (file)
@@ -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>
 
index 3e2e252..0ef5084 100644 (file)
@@ -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>
index 552df33..e3ff120 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=../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 () {
index 5b49e9b..826d359 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=../http/tests/media/media-file.js></script>
+        <script src=media-file.js></script>
         <script>
             if (window.layoutTestController) {
                 layoutTestController.dumpAsText();
index 9995e2a..5325248 100644 (file)
@@ -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() {
index 59b6f06..6d596a4 100644 (file)
@@ -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 () {
index 9edda7e..91ce631 100644 (file)
@@ -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 () { 
index 4294259..688081c 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=../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 () { 
index 7ad24d2..8221cca 100644 (file)
@@ -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 () { 
index 04068cb..f0f2a45 100644 (file)
@@ -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); } );
index 4c84e85..ae5e11c 100644 (file)
@@ -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;
 
index 2ac69ca..b66da18 100644 (file)
@@ -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, "==");
index 6ec1bbe..4f66c1c 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="../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();
index 2a995d6..9b7e037 100644 (file)
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src=../http/tests/media/media-file.js></script>
+        <script src=media-file.js></script>
         <script>
             function toggleDisplay()
             {
index 6433c5a..3a30d74 100644 (file)
@@ -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;
index 9bf1463..12fa569 100644 (file)
@@ -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;
index aca3c50..02f79de 100644 (file)
@@ -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)
             {
index b563eed..0abdf7e 100644 (file)
@@ -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");
index f671855..9efa0f3 100644 (file)
@@ -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()
index d567c6e..35015bc 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=../http/tests/media/video-test.js></script>
+<script src=video-test.js></script>
 <script>
 
     consoleWrite("");
index 0425a7d..07c936a 100644 (file)
@@ -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()">
index 5e2dba3..b5844d6 100644 (file)
@@ -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; }
index e198317..eee64ac 100644 (file)
@@ -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)
         {
index a7bec95..d0402ac 100644 (file)
@@ -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)
     {
index 7ad940e..f37cd68 100644 (file)
@@ -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;
index 2e1940f..431f8cd 100644 (file)
@@ -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");
index fb79b5c..f411e15 100644 (file)
@@ -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();
index 7fc4e59..38920ce 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=../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);
 
index e9093a0..9c157db 100644 (file)
@@ -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);
index 159f63f..aa36036 100644 (file)
@@ -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;
 
index 8d1abfb..dea1480 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=../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);
     
index 0dd2e33..87ec781 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=../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");
 
index 2f6f86e..de62401 100644 (file)
@@ -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');
 
index 3280ed2..5e81fb4 100644 (file)
@@ -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>
     
index 58e3a59..8013160 100644 (file)
@@ -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>
     
index 72da054..dbc25e6 100644 (file)
@@ -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>
     
index 2004214..8591b5d 100644 (file)
@@ -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();
index 77f6431..ac74f23 100644 (file)
@@ -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;
index 9866c70..f87507d 100644 (file)
@@ -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; 
index 5f9d072..a246dcd 100644 (file)
@@ -1,7 +1,7 @@
 <html>
     <head>
         <title>&lt;video&gt; element with poster size test</title>
-        <script src=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
         <script>
             var posterInfo = 
             {
index 3e8f79f..e264b88 100644 (file)
@@ -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;
index 2b49753..4003251 100644 (file)
@@ -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();
index 63e4fb3..a43c53d 100644 (file)
@@ -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>
 
index 73bce9e..12aa8dd 100644 (file)
@@ -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;
index cf0aacc..7d304ae 100644 (file)
@@ -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);
index b5d6b54..e9c784e 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=../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 () { 
index eb36a96..9191d3b 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=../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;
 
index 797a1e2..d7366a8 100644 (file)
@@ -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");
index a38d3ef..a8c6b5a 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=../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;
index cdd5290..22eb4cb 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=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
 
         <script>
 
index 3e69b2c..c237ff0 100644 (file)
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>&lt;video&gt; 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 = 
index 81525bb..d16ea68 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=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
 
         <script>
 
index f164604..bc56018 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=../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>
 
index b9d32ff..191aee4 100644 (file)
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>networkState after inserting &lt;source&gt; test</title>
-        <script src=../http/tests/media/video-test.js></script>
+        <script src=video-test.js></script>
     </head>
     <body>
         <video controls><source></video>
index 2593017..a86625b 100644 (file)
@@ -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)">
index ef4da9d..ba5a96c 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>moving &lt;source&gt; 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 = 
index b0761b3..a3f3b9e 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>no usable &lt;source&gt; test</title>
-    <script src=../http/tests/media/video-test.js></script>
+    <script src=video-test.js></script>
     <script>
 
         function setup()
index cc7d86e..316b0ee 100644 (file)
@@ -2,8 +2,8 @@
 <html>
     <head>
         <title>crash after removing &lt;source&gt; 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 = 
index e92e617..455a479 100644 (file)
@@ -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=&quot;avc1.4D400C&quot;">
index 67fc49b..3488f54 100644 (file)
@@ -3,8 +3,8 @@
 <head>
     <title> &lt;source&gt; @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()
         {
index 54093c8..31038db 100644 (file)
@@ -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()
index 511fa6c..b186bd8 100644 (file)
@@ -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;
index f7cb800..88fe9ff 100644 (file)
@@ -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>
index b7fa11c..2cc0ee9 100644 (file)
@@ -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;
 
index b4744e9..b4740d6 100644 (file)
@@ -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>
index c9dfcd8..7efa76a 100644 (file)
@@ -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");
index b3dcaf4..b40e0d9 100644 (file)
@@ -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);
index 269eca4..9714fb7 100644 (file)
@@ -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");
index 2e38002..bda4c15 100644 (file)
@@ -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()
index 04c99bd..13a52de 100644 (file)
@@ -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"));
     
index a95faa5..eda3127 100644 (file)
@@ -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>
 
index f198d2e..3c1a72b 100644 (file)
@@ -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>
index 4d227c1..ca8d7c8 100644 (file)
@@ -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;
 
index 02a31d8..4d871fb 100644 (file)
@@ -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");
index 094b95e..3b4e831 100644 (file)
@@ -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);
index 812a637..dea9011 100644 (file)
@@ -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()">
index 92a2ebb..8dc86a3 100644 (file)
@@ -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()
         {
index 27992ae..f75b016 100644 (file)
@@ -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  Andrew Wilson  <atwilson@chromium.org>
 
         Unreviewed, rolling out r79570.
index b73904d..5795340 100644 (file)
@@ -94,6 +94,7 @@ sub getDefaultConfigForTestDirectory
     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 @@ sub getDefaultConfigForTestDirectory
         "-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\"",
index 46617f6..188d814 100644 (file)
@@ -75,6 +75,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase):
         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 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase):
             '-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,
index bd75e27..6bd5b46 100755 (executable)
@@ -74,9 +74,13 @@ class Lighttpd(http_server_base.HttpServerBase):
                 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 @@ class Lighttpd(http_server_base.HttpServerBase):
         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: