Revert accidental commit of a new test that isn't ready for prime time.
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Aug 2015 15:11:07 +0000 (15:11 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Aug 2015 15:11:07 +0000 (15:11 +0000)
Unreviewed build fix.

* http/tests/media/video-media-document-disposition-download.html: Removed.
* http/tests/media/resources/serve-video.php: Remove contentDisposition support.

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

LayoutTests/ChangeLog
LayoutTests/http/tests/media/resources/serve-video.php
LayoutTests/http/tests/media/video-media-document-disposition-download.html [deleted file]

index 28bf1cf..cf1ec48 100644 (file)
@@ -1,3 +1,12 @@
+2015-08-20  Eric Carlson  <eric.carlson@apple.com>
+
+        Revert accidental commit of a new test that isn't ready for prime time.
+
+        Unreviewed build fix.
+
+        * http/tests/media/video-media-document-disposition-download.html: Removed.
+        * http/tests/media/resources/serve-video.php: Remove contentDisposition support.
+
 2015-08-20  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         [Streams API] Sync tests with upstream reference
index b0e5bf8..235226a 100644 (file)
@@ -20,7 +20,6 @@
         "supportRanges" => array_key_exists("ranges", $_GET) ? $_GET["ranges"] : "yes",
         "stallOffset" => array_key_exists("stallOffset", $_GET) ? $_GET["stallOffset"] : 0,
         "stallDuration" => array_key_exists("stallDuration", $_GET) ? $_GET["stallDuration"] : 2,
-        "contentDisposition" => array_key_exists("content-disposition", $_GET) ? dirname($_GET["content-disposition"]) : "",
     );
 
     // 500 on errors
@@ -136,8 +135,6 @@ answering:
         header("Content-Length: " . ($end - $start + 1));
     if (isset($contentRange))
         header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize);
-    if ($isset["contentDisposition"])
-        header("Content-Disposition: " . $settings["contentDisposition"]);
 
     $offset = $start;
 
diff --git a/LayoutTests/http/tests/media/video-media-document-disposition-download.html b/LayoutTests/http/tests/media/video-media-document-disposition-download.html
deleted file mode 100644 (file)
index 0ecc175..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>'stalled' event test</title>
-        <script src=../../media-resources/media-file.js></script>
-        <script src=../../media-resources/video-test.js></script>
-        <script src=../../media-resources/media-controls></script>
-
-        <script>
-
-        var iframe;
-        var timeline;
-
-        function testElement()
-        {
-            timeline = mediaControlsElement(internals.shadowRoot(mediaElement).firstChild.firstChild, '-webkit-media-controls-timeline');
-            if (!timeline)
-                throw "Failed to find -webkit-media-controls-timeline";
-
-            testExpected("mediaElement.paused", false);
-            testExpected('mediaElement.currentTime', 0, '!=');
-            test("timeline.value > 0");
-
-            consoleWrite("");
-            endTest();
-        }
-
-        function play()
-        {
-            waitForEventOnce('timeupdate', testElement);
-        }
-
-        function start()
-        {
-            mediaElement = iframe.contentDocument.querySelector("video");
-            waitForEvent('play', play);
-            mediaElement.pause();
-            mediaElement.play();
-        }
-
-        function setup()
-        {
-            iframe = document.getElementById("container");
-            iframe.onload = start;
-
-            var mediaFile = findMediaFile("video", "../../../../media/content/test");
-            var mimeType = "&type=" + mimeTypeForFile(mediaFile);
-            var fileExtension = mediaFile.substring(mediaFile.lastIndexOf(".") + 1);
-            var contentDisposition = "&content-disposition" + "attachment;test." + fileExtension
-
-            iframe.src = "http://127.0.0.1:8000/media/resources/serve-video.php?name=" + mediaFile + mimeType + contentDisposition;
-        }
-        </script>
-    
-    </head>
-    <body onload="setup()">
-        <p>Test that controls in a media document function.<p>
-
-        <iframe style="width: 400px; height: 300px; border: 0px;" id="container"> </iframe>
-    </body>
-</html>
-