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: http://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 f36f7cdcaa6154884a4e1cd8ae2bb786e791553e..02591375756f1def06d070f56e5fe06610b3fd5f 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 69dfc51a1799720f5b405fd201f70954e905a841..e19c1a454ebed959960f7e5eedae904f75a070f0 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 943b026c36ff7a3ef3a3764dcfabefa53db23438..87f6effb92aa081fe8e3674bd0b1a9468221b0ab 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 b7aea82085ce4bc3304d69041d5f801e332cc907..5015b38a1d1c4bb502f93bf06de3077b08ebb56c 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 59752056139c76b4efe0c7ec7f5639437be29183..7c02db43e62d9a80111fc2ec7a598312401e8ea9 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 9eb75a0adbe3ecd15a5020d429011d77bc0184e4..105ca9465cabda44a86d7d5d3887ae09d54f4ba0 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 08f504b7f8d38c0cc1bee45fd0b564fff8fb3850..885ce459e5be6a50bb13a66cd6dce05b56354b86 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 cb0f43c5cdfc3d502ca90f4b88f1a9e4a62bbcf8..06defa22d571c01c42eeb35ae7f6cfc5481e4dbc 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 b64c869594ede3f27bb54c0c91e5c660119dd33b..192e405e128c3c42935196fe3b5c7bf9c2a0bb6a 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 165ec3c29ee1df6c812ffaf37a1d6c068ba11c8b..3c39047eef262501b7fd843144e8fecc9583b3df 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 03d87448ab6cb1d47579aaa12d5a4db1e4ea20b8..82acd62c84d3895b3f94cccbee407c6371dbd769 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 969ec22325f611c9a8b43a68ba905a689e712b55..af5481129317faa165c6fee2e29cd4c23d958513 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 5789e73d58c60e289c5385d82125319b49938206..092e907895d6ecb40881322d3be5297e6159c0f5 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 7953c60547464516188c417b923dffdfbb52f66a..e6e9f79da8fe3cdafe536ea2a95cabd5acf5b8ef 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 9326e2aa6f2516d6ef5072e06cadcd5cd78d6273..ad47d051ca867899fe44cf516a7b65042cf865db 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 69ef3254d4fcc0beccb3c739a605af83ba67e8df..4c00cb3fef6e9e721135ea071c0226264d33ac10 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 4f3e861016a27d16aa0d8fcd8b349e2471ec1f97..993a14da6e1668e97dcdef4f3e8ff4905d392888 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 da582b95dc06d68643f4000b2ce0e0d175a16d81..d3a104fdada4692a3bb98df627682a7f67519935 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 b9eb336cc8fc30f94e3b7226f5f9ac35af305f5a..078f905bc87f7c75935d0f594f2ae0623bece90c 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 00971e07cfe639fd46a90cc071738e4cadd49dde..5c13e2600b653c0c212c297c40cb3e20a52342c3 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 d75410b5d9ffb7400b33ada8a4fddf04492af746..43e0c1dbf2a9a332f570ea606e0968a971a12e7d 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 8386769ef4e457f9c866d74e3d7621246089af13..9dd2b379fcbbc959d305a69fa7fd73fbd7164eea 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 9ade2c22c60fd144be55c267d0b10cf351f2c1fc..6345ce5054263ed52a1c0c462d04a89412668720 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 0aa7896e45582762be4117b4e018592990bfbe9a..d087d5c7070a3a9a3cb572b9c3553b8c0fcff672 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 0ec28879e8a3ce8420b8d4143e594943dee8d781..1407f6d90d933b8d40453bd29ebe1b30c19526d6 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 270d5c3aa86a32cf59cfe2b67feda8256eb45eb6..bab7f654e82ca766956ada1ee8f3f3fc64de9e93 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 596a205752be8911a55af27740387f666300334a..315df8ef830b757da0164a1484e1347c9a944370 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 f2671d5dac3b81170cde0052576576997b9fa47f..58866a5f2f5eaf74736ff3f225cb3409490df17e 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 40234aa270e57310cb89ebd1fd5c17c991d9a314..3aa84247e2b7c25713dd10d35801d81af7369ebc 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 3c844af9a5ad49f6929dd9114533b75e6b334f63..61125eeeff7e91a43db73dcf8ea8c065d73b5750 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 993bd60249345e14f76dca6ce407fca4e2204164..ae80f14b07b67253b7c975b31961a44961a410d9 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 b0c7def69bee3f4d1811e3647a28bde51dbd7513..499823512e20259fc1574a34833ed7636a17f0b6 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 5b680f5577f7ac3c0cf8f9e2dc9e3b422debc261..8ac44b512be2084597b4591421ccdc193aa15266 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 402388f4c6d2298b7220ace15043d227218b0783..ea2416a7844b7674c88c7df99763dc8069a67744 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 0e242346ae98296c25e444c1e26e425530e8d062..fad0373fd4b9aed281bd2ff1ae376fa533ed51d8 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 88560aa2a9ea8471d8f1d1c8b7c6c88696a11431..de5b4de4441f68599e44d12f7927e8c60d8a9f6c 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 e3f0a11cb00b8ef37baf4b527a2b4057b2bb4e42..453ae4675e6264c534066bc780d2b12fe4116512 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 3eb35e7a3d569a37fa5bfc1a125ba0476434fafa..95b35314239b1f5a728369fa9eddcb0bc7a9d3ad 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 10d092dc3c324bea7f20f9ce8319533954603f37..bc9610add7096f8aa558864537ccb9a3aceb918d 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 b66bbad645a2f2db993ad91f5c5b8cd3dbcd0943..73f9be65b283c7d24f1234b80d2f4bc994268d86 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 32355d5e461eaddab44033bd3ef770bd9ea829ef..98894698e943ce1a6d1d26bb5e5f08e5d3e68c3b 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 c96325beb74d5b34b3edbac5f31628cf82e68e6f..7a9e67fbcaba4e708e19b75d80e5af30bc50eee0 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 e5a76b5661491e30557de59d76510f26a39bbd00..bc6fc395ce2853a2d7b9354cd73202c8a254f58d 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 885a987701f578c373b84e50206fbebf46565e80..4ac9aa77157976dc4de0163f7c788b05831c9c50 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 750961cd8c4fe3634aec14a4a7841cd686190a92..94adeda5c40143f4a566fe89f7f1cd3b9fa5c8ac 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 9361ee47b34a754b458cc9b6944132977d027385..b2f45653e0352fc813255e41914696dd284e7c39 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 f30d17359ea4d10edd0ce96b82bdf8cd02690ca2..b4ad1a6fd5f573b81a24efe60de086e0472ef013 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 fd7008b88b07a10a309337cbd947456b6ea78f52..571ec815dc3a2a5a569eb542fddf63ba6b848e6c 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 db01f48c2e69c5455e830cd2e4f6bbdbfaf19f70..dbb5bee8a56fbf2d2044d6bb4c3350da398d538e 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 ad3a31e351d312862fac54d5019ffe83c11f2846..e8382bd5684e1db7ac40013853119d5184b99cc3 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 172633aeee81e3eb27cc75d58c833afe370607f1..afe21eb11fc291aeb4518dda089461c4387419d5 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 76ff1450a22b89ad13e94b0f51f38a37f5947d9e..1cb37bbd54bd35eabe01e7efd51b0ddfd7851bf8 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 131991fbcb0b5ca2cc896e70bf41be7e14d8d186..d95f6aa30500472abab69a02712895495bdad315 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 47cc82b96ac19033ecb7b3084081bf1ffa13ea3f..a125e42845270df949d254d596249bac9829c0b0 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 6247573231fe81f4eec29d07acf5297582521cee..bea9820b4eb309653493863b7622bf1f13e79099 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 fbe9a278ecc5b1f0d66d7af28ec9a205d67d803d..57d05c9bcb211fc45b6da3116d8a811d17ef0b2a 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 7de73f5d4aa97c5ec8915af59b6f46ed6f6bb99e..00b79ef3d787e99681ef981db50e027725490771 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 3b260d44e21bc820539807bbd34fcaf1391f4e98..ffd95a930e0b6840858adf81325f3dd7e203d9ed 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 075cee9a39e1e6d3b3b5d2401854dcfdd15799dd..e1d8ba211a615c50b843c221f23433d3af91f4bf 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 8d94a8df31350b67f86f4f07743490a6a6ba2199..2885fd4c20e4d68393357bc1cbf8ac1fb44a555b 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 7fe0d566386a4e73c24a135ef5a81bad292f9da6..873381d3fa502e8496017deb56e3bdc81efc22b8 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 26a408724c6b7507013a7e5c8732b6d6463351bb..9001ae14a2e987b0035662f5733388e10c5ae8a3 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 d93ea5a4f7a5cbff6bed0effc3dd92bba03bf33d..1b3efd768c22139238ca65ecc2a6a4a698bb7524 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 578aa1607e8b9890f63b9adaeb36eb0919b9e52e..7a13e43203f099f3f912ed5e6156717aefdd0ee8 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 ea20186272031776f884085ff4dbcf323c6d6e53..0ba5c430ffc57732d50afad2372bf0356af8f381 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 3e2e25285fc9549453a1c3c576aab6fc3877e819..0ef508407c0794bdebdecf1c5413be8fd9f3f337 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 552df33fdf810668726f60d7b8038c9749049527..e3ff1206bc2ba723b01295a4f08cf915abeab144 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 5b49e9bd65a98570bb92b7119fc39a805edc2fc9..826d359541dfaecb9173b59e168137ae474df894 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 9995e2aed8c9684d286205beaf36864385f768e9..532524824c6c304a61d51f425ab44576ee57c927 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 59b6f06b9cc025d6cf7fc09f35e6bbfbc0e7f353..6d596a4cdb182e76ebaddc34f7a2863d55101f59 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 9edda7e89930f026f2c132a5e15307d4df778d8e..91ce6313684fb9722f494dbc2018a82707896d40 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 42942593e3ee71ea13e4961712efcf25076f536d..688081c1523f9d3875ddeb60555f915a27744179 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 7ad24d281db0d83aea4b2233549f1397275ded90..8221cca8d3046ad1e594f3714e648a6da14ca050 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 04068cb80e093d33427a1eec1fd2bf7e5bd3497b..f0f2a4537acf1d06726d56a60c89d98a74438557 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 4c84e85d5900fba0a9326b7c7fde26d5312303cb..ae5e11c67960e7595bd0bc9239a8a494d1c87a97 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 2ac69ca4f44c9231e8ceefb2df3208d235027bfa..b66da18cc5609c2819caf7bc3b78643668262b1c 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 6ec1bbed14ad2cf832caac44f8dee3167b4bf18a..4f66c1c6ce647d944ee7d6fa9651f8ec4913e966 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 2a995d64639efcf5b8ce1444b75fac25ed941349..9b7e037aec09c18cb5f22f899ce640afdec05f9a 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 6433c5a94ba84b8db17fc9861a9c570c8532bb01..3a30d74f4e3568e9eaa3b00c68ff68220fea97cb 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 9bf146374a0dc38f3224949bd2ab28413673771f..12fa569200c26699eaa32093414c25fa4f34e83d 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 aca3c50e41b53d41983392fb6c01ce1d7cfbcdbf..02f79de121cb237e397dc05c65f5910806991e87 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 b563eed936373279cba96f0dbe65a7a5bf2f9351..0abdf7e0c131795ffcd1740940569866fcdd82c9 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 f671855eadf6103a8402b515758c372c721c01e7..9efa0f33ed717b24753fceeced7e06c56cef46c2 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 d567c6e6b4c69251b49d22421fec973e233dee45..35015bc502821e9ff273f6b203cbdf9a6d202722 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 0425a7d000b50411f578c4ea2adf0c0ffb112882..07c936a0143f46b567462cac5b342d1f9121b25e 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 5e2dba3d3ab620ade5a6e0fdf88132581712e140..b5844d616ddf66b92440d09db4b53a183a1509d2 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 e198317ff6015f5ae6393a858841179d1eca77f5..eee64ac8ac51df5091df526748dc826d6dac718e 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 a7bec95ac4bc56445ace15b1608488aa56563afd..d0402acb93b63e8df94eaa269d5e104a648dbbbb 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 7ad940eb4aae5a5d9828821c7f407987942c58ef..f37cd68fba38eb12ec8211059949d75870681e26 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 2e1940ffc0d29189042094e77e73245c8f1868e3..431f8cd6ea3d2032fbc45c6924c49bac3d9566d9 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 fb79b5cb0b0d7b5ba08666048a2a5b0bd5318ecc..f411e151794ada04e7ac151505c8e92edd4228ce 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 7fc4e59a7a640ccbd8e7f10b2cad73b0e3284ab9..38920ceaa662a47be7e17f57a495ca0135e3081e 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 e9093a05582a7d60cb4461cdfd46594ff9fee826..9c157db9a6b3531a30f7d2e1575a9df0b2e3a17d 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 159f63fec5c5c2319606562da4ed64024c2e484d..aa36036cb2fb3d1f0ee3ec0889634125a68db5c9 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 8d1abfb27a2e000e8c5b876da8aba73e1b8a3780..dea1480bec65065138294b0739b4751f6bc8a731 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 0dd2e33cc7cb0dfa8dfc96b61fd07cf295a88399..87ec7812f2bb0c63c3fb24ee064c274c1324fe4b 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 2f6f86e92f1072353bd77726ed9f93f868a14241..de624016c09a2aaa9b6e43aa3a3f06a40d044ef5 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 3280ed22f15e0d4f1f0b79878f9f27f7f61dea53..5e81fb4355c7686c49bc8577abf7a2447c5b9e08 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 58e3a59a6c301a58428be03e41559231665d0053..801316082e3e7c06a56f3a75f86c4aa59777b0c6 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 72da0540b6f9e289dc2bb0d78669efbc71cd2ee8..dbc25e6c7e8a7d527564690040b6e6c6df72712f 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 2004214b537529110ae808657a664749b77f6b3f..8591b5db52d5f6f2952e5cbceb56f2b2675c34df 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 77f6431ffe8d28ebec7c5792938c298452fdfbad..ac74f23396ed730b96e9f2f35a6e43d2e0554858 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 9866c701cf84b2d7ed5bfe5808a03353ac55543f..f87507d741ae063117d854ba2e878cb3684cd5e9 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 5f9d07286c32064d560338e3f96ed935ddc13543..a246dcd8d0377e07cc304644d31a71e546d37fa3 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 3e8f79f7e5437440b593a5821f98008636322389..e264b888f9ed8a70bca527295d19d64b3d96449c 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 2b49753a7af9099ac7b3994e3dec93fe5c6b2efc..40032519912d194415ee253d23fab8971841af0e 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 63e4fb3cf58f1c41bbc459b48ae0f147dec88e6a..a43c53da55cc6dbe99f634730c68682e880ad57c 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 73bce9e89814cd1a6765cf6205295378af21c43e..12aa8ddcb830e27ed0b401427deecb7a4473a9ed 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 cf0aacc238ae81812968f60e29acf6b0d6bb8991..7d304aec2760fc0d202779b3dfdab4cc53653b34 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 b5d6b543d24625b10bbbfce2c99850a4a93cf33e..e9c784ea71e5a8f7a42bdc7d1cd3666756c0c868 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 eb36a96d353415d56ca432f80573904819e4f4eb..9191d3b9164fd7b319c2017e0488ed5c60109a80 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 797a1e2aadb2344b449548ea5539d9b826d25019..d7366a8fe8af6a34e0f19b212ad1633ef9a86874 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 a38d3ef0118f1e032ef8cbd76d41a3f4d6d5deba..a8c6b5aec9efc1369440ef5cc9342eb1ce9a1094 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 cdd52905a9d2d2c62ee7c1bc5216d9e5f305f2c7..22eb4cbd8063446667fc921dbdea2ed8e629c9d9 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 3e69b2c589d06c48e9c3cee1e3d3b4c47f2f1a48..c237ff0a0c884a2362ba8ba9ad7583aa7af4336d 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 81525bb6f31273324b9ece5a88cb9f42f9c90d91..d16ea688fa6d319d39f58b01fe8b7998bc4ef4b9 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 f1646042725ecc4769687d1110bf35f2be6693ec..bc5601851f326929200a03a0791f9da18e910e57 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 b9d32ff27067a8874affb30c77b2521d0467425f..191aee4b35f8d6619206c7a9994bbf90eae8cc8d 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 25930170c978886464a01395efe4570bb78dec28..a86625b8dff0849a011faaa4ae2b96cab0031c48 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 ef4da9d3ef40ace4cac46104bfde7d39172868c5..ba5a96cc5201bbcd2f0f33377c3ea909711a5a36 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 b0761b31c49a8cc0837482a4bbec8ee43a131848..a3f3b9e26ecb58fa1eea27d85897dd61dab1aeb3 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 cc7d86eba8a548e7fe968a657d5ba15405598372..316b0eedd1c32ce83c2df028585893b2f51b9ad6 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 e92e617b9565e62ad5989686723475da513770c3..455a47954d4bd4892a4c68d4beee57871ad7c86f 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 67fc49b605ffd77171119518efe2771fcb9beb80..3488f540ec3f650fceead0e1f3a8360ae012ea26 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 54093c875fd00b7c4f10c2d52be49af6e6fac35c..31038db26becb195d1b17e6f8832cdd3359c7c8f 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 511fa6c904cb66c1f88afcf417e77e6a7260a9e9..b186bd865ea4def0333960e50fa543a82005c494 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 f7cb800241f94ffcc8bf090d7a61ef14778a578b..88fe9ffa8e1578904616cca6348553def612a2da 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 b7fa11c9be52fd1e12c785e82ce3ec05fedde699..2cc0ee9fced3b7bdb0bee9311a300cb9028cd07b 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 b4744e92bf15cede6709bc47fef5eae00320ef1d..b4740d607741cbb505ff862ff6e76938f3f71cc0 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 c9dfcd8249ab01184bd631bc049dffc94cb90816..7efa76a4d809feaff315d7b828e53c9aaf19a40e 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 b3dcaf4383c843901b087fb2e67588c3aa8fd2d0..b40e0d9472e087b3100113aa14db6952709e6691 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 269eca4c9008f483da968c1102441289fb6d82a2..9714fb7373eccbfefa0cc0890bd105a2c58de708 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 2e380023f9bb863117c4090c45dbd10cb7f8fe97..bda4c15df814f796f5bba0834786773ecb2a2b22 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 04c99bd2cd1a90b0f126dfbf41afbe94c3cdd26e..13a52dec2d4a5d62169864d07e0672bd8eb0cfa0 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 a95faa5db0f0b36a20a2aa0e8a9223edc235092c..eda31278156b1002baac08e80acbafffad8cddfc 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 f198d2e5ed62dac00311c618e7668920d46029bd..3c1a72b7d79dd3cf26cde44c6353c9bdd26f84a0 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 4d227c1d754036a9d63ac6990b4a6439b7f44e84..ca8d7c8b155973e774c555a32efa891b4249dd36 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 02a31d8ac391b2b0d3c2c3d3a739378066acc106..4d871fb6f09a7d5f22fe667ef717ed8fe71331d4 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 094b95e5e7cbc8b17e263f82a5352494bb11dcbe..3b4e831402dc8cac8597c4f18a7bbba06297943d 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 812a637fa182c56082d08d64a5cf789882c29e3b..dea901150a09d4e5940e2abbdb963db1fb18a1eb 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 92a2ebb75c956e4c4b56809d2eb7fcc497924c8c..8dc86a373584902736a82b420a2c1c0805ada8a9 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 27992aedaf4b807c69ccbaa6cbcbead558889176..f75b01692591fd68892f2bf1d3e1f92ae3b6d633 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 b73904dce34facae57c5831614e3e053a5a2da90..57953403aa9ad40475b4309f08387623ea6a167f 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 46617f663c93ccca0776c7a409747f7f2de07666..188d814ed9cd26d0f7e797c31ddbf3284c406133 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 bd75e272638b7d2522355f749229e751bdd87180..6bd5b465aef15e6a2161ba8bb0377b01b06d1ed7 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: