<!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>[166009] 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/166009">166009</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 15:33:04 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a flushing mechanism for the WebVTTParser
https://bugs.webkit.org/show_bug.cgi?id=130532
Reviewed by Eric Carlson.
Merged from Blink (patch by vcarbune@chromium.org):
https://chromium.googlesource.com/chromium/blink/+/1ac2b3081492ab8661429230004013a9a3623f0f
http://crbug.com/54203003
https://chromium.googlesource.com/chromium/blink/+/24343d32bc36d20d59ef3e10040faddde65929e6
http://crbug.com/59453002
https://chromium.googlesource.com/chromium/blink/+/ef2793f1d9d207389589ecf9a136ea5c7170b4af
http://crbug.com/75233002
https://chromium.googlesource.com/chromium/blink/+/a29f2f8324abcd4826b41e7dc34373dee2ec57a9
http://crbug.com/52713005
https://chromium.googlesource.com/chromium/blink/+/7ce003c8d47b39f116f1f2a592a5dfb4a9e77228
http://crbug.com/64303004
https://chromium.googlesource.com/chromium/blink/+/18f896b3498478311e880f782813d5dfc8c0c7d1
http://crbug.com/96933004
https://chromium.googlesource.com/chromium/blink/+/8670e8ecb13254a651f5493ec83f4484d18c154e
http://crbug.com/98783005
https://chromium.googlesource.com/chromium/blink/+/4ac55780a6af3d76e0159c1d145330964ad56647
http://crbug.com/104713002
* http/tests/media/track: Added.
* http/tests/media/track/track-webvtt-slow-loading-2-expected.txt: Added.
* http/tests/media/track/track-webvtt-slow-loading-2.html: Added.
* http/tests/media/track/track-webvtt-slow-loading.html: Added.
* media/track/captions-webvtt/captions-multiline-lf.vtt: Added.
* media/track/track-webvtt-tc023-markup.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackwebvtttc023markuphtml">trunk/LayoutTests/media/track/track-webvtt-tc023-markup.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/media/track/</li>
<li><a href="#trunkLayoutTestshttptestsmediatracktrackwebvttslowloading2expectedtxt">trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediatracktrackwebvttslowloading2html">trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmediatracktrackwebvttslowloadinghtml">trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading.html</a></li>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvttcaptionsmultilinelfvtt">trunk/LayoutTests/media/track/captions-webvtt/captions-multiline-lf.vtt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166008 => 166009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-20 22:24:01 UTC (rev 166008)
+++ trunk/LayoutTests/ChangeLog 2014-03-20 22:33:04 UTC (rev 166009)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-03-20 Brent Fulgham <bfulgham@apple.com>
+
+ Add a flushing mechanism for the WebVTTParser
+ https://bugs.webkit.org/show_bug.cgi?id=130532
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by vcarbune@chromium.org):
+ https://chromium.googlesource.com/chromium/blink/+/1ac2b3081492ab8661429230004013a9a3623f0f
+ http://crbug.com/54203003
+ https://chromium.googlesource.com/chromium/blink/+/24343d32bc36d20d59ef3e10040faddde65929e6
+ http://crbug.com/59453002
+ https://chromium.googlesource.com/chromium/blink/+/ef2793f1d9d207389589ecf9a136ea5c7170b4af
+ http://crbug.com/75233002
+ https://chromium.googlesource.com/chromium/blink/+/a29f2f8324abcd4826b41e7dc34373dee2ec57a9
+ http://crbug.com/52713005
+ https://chromium.googlesource.com/chromium/blink/+/7ce003c8d47b39f116f1f2a592a5dfb4a9e77228
+ http://crbug.com/64303004
+ https://chromium.googlesource.com/chromium/blink/+/18f896b3498478311e880f782813d5dfc8c0c7d1
+ http://crbug.com/96933004
+ https://chromium.googlesource.com/chromium/blink/+/8670e8ecb13254a651f5493ec83f4484d18c154e
+ http://crbug.com/98783005
+ https://chromium.googlesource.com/chromium/blink/+/4ac55780a6af3d76e0159c1d145330964ad56647
+ http://crbug.com/104713002
+
+ * http/tests/media/track: Added.
+ * http/tests/media/track/track-webvtt-slow-loading-2-expected.txt: Added.
+ * http/tests/media/track/track-webvtt-slow-loading-2.html: Added.
+ * http/tests/media/track/track-webvtt-slow-loading.html: Added.
+ * media/track/captions-webvtt/captions-multiline-lf.vtt: Added.
+ * media/track/track-webvtt-tc023-markup.html:
+
</ins><span class="cx"> 2014-03-20 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] getClientRects returns wrong rectangle
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediatracktrackwebvttslowloading2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2-expected.txt (0 => 166009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2-expected.txt 2014-03-20 22:33:04 UTC (rev 166009)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+Slow loading WebVTT file interrupted in the middle of a timestamp line.
+
+EXPECTED (track.track.cues.length === '2') OK
+EXPECTED (track.track.cues[0].text === 'Lorem ipsum') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediatracktrackwebvttslowloading2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2.html (0 => 166009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading-2.html 2014-03-20 22:33:04 UTC (rev 166009)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!doctype html>
+<title>Slow loading WebVTT file interrupted in the middle of a timestamp line</title>
+<script src=/media-resources/video-test.js></script>
+<script>
+function loadAndStall()
+{
+ return "http://127.0.0.1:8000/resources/load-and-stall.php";
+}
+
+function vttTrack()
+{
+ return "?name=../../../media/track/captions-webvtt/captions-multiline-lf.vtt&mimeType=text%2Fvtt";
+}
+
+window.onload = function()
+{
+ video = document.createElement('video');
+ track = document.createElement('track');
+ video.appendChild(track);
+ track.onload = function() {
+ testExpected("track.track.cues.length", 2, "===");
+ testExpected("track.track.cues[0].text", 'Lorem\u000aipsum', "===");
+ endTest();
+ };
+ track.onerror = function() {
+ failTest();
+ };
+ track.src = loadAndStall() + vttTrack() + "&stallAt=32&stallFor=1";
+ track.track.mode = "hidden";
+}
+</script>
+<p>Slow loading WebVTT file interrupted in the middle of a timestamp line.</p>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediatracktrackwebvttslowloadinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading.html (0 => 166009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/track/track-webvtt-slow-loading.html 2014-03-20 22:33:04 UTC (rev 166009)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!doctype html>
+<title>Slow loading WebVTT file interrupted just after a cue text linebreak</title>
+<script src=/media-resources/video-test.js></script>
+<script>
+function loadAndStall()
+{
+ return "http://127.0.0.1:8000/resources/load-and-stall.php";
+}
+
+function vttTrack()
+{
+ return "?name=../../../media/track/captions-webvtt/captions-multiline-lf.vtt&mimeType=text%2Fvtt";
+}
+
+window.onload = function()
+{
+ video = document.createElement('video');
+ track = document.createElement('track');
+ video.appendChild(track);
+ track.onload = function() {
+ testExpected("track.track.cues.length", 2, "===");
+ testExpected("track.track.cues[0].text", 'Lorem\u000aipsum', "===");
+ endTest();
+ };
+ track.onerror = function() {
+ failTest();
+ };
+ track.src = loadAndStall() + vttTrack() + "&stallAt=49&stallFor=1";
+ track.track.mode = "hidden";
+}
+</script>
+<p>Slow loading WebVTT file interrupted just after a cue text linebreak.</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvttcaptionsmultilinelfvtt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/captions-webvtt/captions-multiline-lf.vtt (0 => 166009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/captions-multiline-lf.vtt (rev 0)
+++ trunk/LayoutTests/media/track/captions-webvtt/captions-multiline-lf.vtt 2014-03-20 22:33:04 UTC (rev 166009)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+WEBVTT
+
+1
+00:00:00.000 --> 00:00:00.300
+Lorem
+ipsum
+
+2
+00:00:01.200 --> 00:00:01.500
+dolor and literal NUL > <
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackwebvtttc023markuphtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-webvtt-tc023-markup.html (166008 => 166009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-webvtt-tc023-markup.html 2014-03-20 22:24:01 UTC (rev 166008)
+++ trunk/LayoutTests/media/track/track-webvtt-tc023-markup.html 2014-03-20 22:33:04 UTC (rev 166009)
</span><span class="lines">@@ -97,9 +97,7 @@
</span><span class="cx"> fragment = document.createDocumentFragment();
</span><span class="cx"> fragment.appendChild(document.createTextNode("The following bear is not ruby annotated and markup is removed:\nI said "));
</span><span class="cx"> fragment.appendChild(document.createTextNode("Bear"));
</span><del>- var rt = document.createElement("rt");
- rt.appendChild(document.createTextNode("bear with me"));
- fragment.appendChild(rt);
</del><ins>+ fragment.appendChild(document.createTextNode("bear with me"));
</ins><span class="cx"> fragment.appendChild(document.createTextNode(" is coming!!!!"));
</span><span class="cx">
</span><span class="cx"> testExpected(fragment.isEqualNode(video.textTracks[i].cues[3].getCueAsHTML()), true);
</span></span></pre>
</div>
</div>
</body>
</html>