<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188686] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188686">188686</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-20 08:11:07 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourcesservevideophp">trunk/LayoutTests/http/tests/media/resources/serve-video.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediavideomediadocumentdispositiondownloadhtml">trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188685 => 188686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-20 13:55:06 UTC (rev 188685)
+++ trunk/LayoutTests/ChangeLog 2015-08-20 15:11:07 UTC (rev 188686)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-08-20 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Sync tests with upstream reference
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourcesservevideophp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/resources/serve-video.php (188685 => 188686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> "supportRanges" => array_key_exists("ranges", $_GET) ? $_GET["ranges"] : "yes",
</span><span class="cx"> "stallOffset" => array_key_exists("stallOffset", $_GET) ? $_GET["stallOffset"] : 0,
</span><span class="cx"> "stallDuration" => array_key_exists("stallDuration", $_GET) ? $_GET["stallDuration"] : 2,
</span><del>- "contentDisposition" => array_key_exists("content-disposition", $_GET) ? dirname($_GET["content-disposition"]) : "",
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // 500 on errors
</span><span class="lines">@@ -136,8 +135,6 @@
</span><span class="cx"> header("Content-Length: " . ($end - $start + 1));
</span><span class="cx"> if (isset($contentRange))
</span><span class="cx"> header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize);
</span><del>- if ($isset["contentDisposition"])
- header("Content-Disposition: " . $settings["contentDisposition"]);
</del><span class="cx">
</span><span class="cx"> $offset = $start;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideomediadocumentdispositiondownloadhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html (188685 => 188686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-<!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>
-
</del></span></pre>
</div>
</div>
</body>
</html>