Title: [188686] trunk/LayoutTests
- Revision
- 188686
- Author
- [email protected]
- Date
- 2015-08-20 08:11:07 -0700 (Thu, 20 Aug 2015)
Log Message
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.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (188685 => 188686)
--- trunk/LayoutTests/ChangeLog 2015-08-20 13:55:06 UTC (rev 188685)
+++ trunk/LayoutTests/ChangeLog 2015-08-20 15:11:07 UTC (rev 188686)
@@ -1,3 +1,12 @@
+2015-08-20 Eric Carlson <[email protected]>
+
+ 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 <[email protected]>
[Streams API] Sync tests with upstream reference
Modified: trunk/LayoutTests/http/tests/media/resources/serve-video.php (188685 => 188686)
--- trunk/LayoutTests/http/tests/media/resources/serve-video.php 2015-08-20 13:55:06 UTC (rev 188685)
+++ trunk/LayoutTests/http/tests/media/resources/serve-video.php 2015-08-20 15:11:07 UTC (rev 188686)
@@ -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 @@
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;
Deleted: trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html (188685 => 188686)
--- trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html 2015-08-20 13:55:06 UTC (rev 188685)
+++ trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html 2015-08-20 15:11:07 UTC (rev 188686)
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>'stalled' event test</title>
- <script src=""
- <script src=""
- <script src=""
-
- <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 = "" + 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>
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
