<!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>[165498] trunk</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/165498">165498</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 14:08:45 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebVTT] HTML5 "space" cahracters around "-->" are not required
https://bugs.webkit.org/show_bug.cgi?id=117421
Reviewed by Eric Carlson.
Merged from Blink (patch by caitpotter88@gmail.com):
https://chromium.googlesource.com/chromium/blink/+/4ef469cd627a13696b88e285ae28a60e38f9c286
http://crbug.com/242158
Source/WebCore:
New tests: media/track/track-webvtt-tc029-timings-whitespace.html
* html/track/WebVTTParser.cpp:
(WebCore::WebVTTParser::collectTimingsAndSettings): Make whitespace around cue-timings optional.
LayoutTests:
* media/track/captions-webvtt/tc008-timings-no-hour-errors.vtt:
* media/track/captions-webvtt/tc009-timings-hour-error.vtt:
* media/track/captions-webvtt/tc029-timings-whitespace.vtt: Added.
* media/track/track-webvtt-tc029-timings-whitespace.html: Added.
* media/track/track-webvtt-tc029-timings-whitespace-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvtttc008timingsnohourerrorsvtt">trunk/LayoutTests/media/track/captions-webvtt/tc008-timings-no-hour-errors.vtt</a></li>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvtttc009timingshourerrorvtt">trunk/LayoutTests/media/track/captions-webvtt/tc009-timings-hour-error.vtt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTParsercpp">trunk/Source/WebCore/html/track/WebVTTParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvtttc029timingswhitespacevtt">trunk/LayoutTests/media/track/captions-webvtt/tc029-timings-whitespace.vtt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackwebvtttc029timingswhitespaceexpectedtxt">trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackwebvtttc029timingswhitespacehtml">trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165497 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-12 21:02:02 UTC (rev 165497)
+++ trunk/LayoutTests/ChangeLog 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-12 Brent Fulgham <bfulgham@apple.com>
+
+ [WebVTT] HTML5 "space" cahracters around "-->" are not required
+ https://bugs.webkit.org/show_bug.cgi?id=117421
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by caitpotter88@gmail.com):
+ https://chromium.googlesource.com/chromium/blink/+/4ef469cd627a13696b88e285ae28a60e38f9c286
+ http://crbug.com/242158
+
+ * media/track/captions-webvtt/tc008-timings-no-hour-errors.vtt:
+ * media/track/captions-webvtt/tc009-timings-hour-error.vtt:
+ * media/track/captions-webvtt/tc029-timings-whitespace.vtt: Added.
+ * media/track/track-webvtt-tc029-timings-whitespace.html: Added.
+ * media/track/track-webvtt-tc029-timings-whitespace-expected.txt: Added.
+
</ins><span class="cx"> 2014-03-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r165482.
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvtttc008timingsnohourerrorsvtt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/captions-webvtt/tc008-timings-no-hour-errors.vtt (165497 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/tc008-timings-no-hour-errors.vtt 2014-03-12 21:02:02 UTC (rev 165497)
+++ trunk/LayoutTests/media/track/captions-webvtt/tc008-timings-no-hour-errors.vtt 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -19,8 +19,4 @@
</span><span class="cx">
</span><span class="cx"> 5
</span><span class="cx"> 02:01.000 --> 03m:00.500
</span><del>-I said Bear is coming now!!!!
-
-6
-03:01.000-->04:00.500
</del><span class="cx"> I said Bear is coming now!!!!
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvtttc009timingshourerrorvtt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/captions-webvtt/tc009-timings-hour-error.vtt (165497 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/tc009-timings-hour-error.vtt 2014-03-12 21:02:02 UTC (rev 165497)
+++ trunk/LayoutTests/media/track/captions-webvtt/tc009-timings-hour-error.vtt 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -19,8 +19,4 @@
</span><span class="cx">
</span><span class="cx"> 5
</span><span class="cx"> 00h:03m:01s.000ms --> 00h:03m:00s.500ms
</span><del>-I said Bear is coming now!!!!
-
-6
-00:04:01.000-->00:03:00.500
</del><span class="cx"> I said Bear is coming now!!!!
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvtttc029timingswhitespacevtt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/captions-webvtt/tc029-timings-whitespace.vtt (0 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/tc029-timings-whitespace.vtt (rev 0)
+++ trunk/LayoutTests/media/track/captions-webvtt/tc029-timings-whitespace.vtt 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+WEBVTT
+Whitespace (U+0020, U+0009, U+000C) surrounding cue-timings separator "-->" is optional
+
+1
+00:00:00.100 -->00:00:01.500
+Single U+0020 SPACE left of cue-timings separator "-->"
+
+2
+00:00:00.100--> 00:00:01.500
+Single U+0020 SPACE right of cue-timings separator "-->"
+
+3
+00:00:00.100 -->00:00:01.500
+Single U+0009 TAB left of cue-timings separator "-->"
+
+4
+00:00:00.100--> 00:00:01.500
+Single U+0009 TAB right of cue-timings separator "-->"
+
+5
+00:00:00.100 -->00:00:01.500
+Single U+000C FORM FEED left of cue-timings separator "-->"
+
+6
+00:00:00.100--> 00:00:01.500
+Single U+000C FORM FEED right of cue-timings separator "-->"
+
+7
+00:00:00.100 -->00:00:01.500
+Several U+0020 SPACE left of cue-timings separator "-->"
+
+8
+00:00:00.100--> 00:00:01.500
+Several U+0020 SPACE right of cue-timings separator "-->"
+
+9
+00:00:00.100 -->00:00:01.500
+Several U+0009 TAB left of cue-timings separator "-->"
+
+10
+00:00:00.100--> 00:00:01.500
+Several U+0009 TAB right of cue-timings separator "-->"
+
+11
+00:00:00.100 -->00:00:01.500
+Several U+000C FORM FEED left of cue-timings separator "-->"
+
+12
+00:00:00.100--> 00:00:01.500
+Several U+000C FORM FEED right of cue-timings separator "-->"
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackwebvtttc029timingswhitespaceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace-expected.txt (0 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace-expected.txt (rev 0)
+++ trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace-expected.txt 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+Tests that "Skip whitespace" step around cue-timings separator is working correctly.
+
+
+
+*** Testing text track 0
+EXPECTED (cues.length == '12') OK
+EXPECTED (cues[0].id == '1') OK
+EXPECTED (cues[0].startTime == '0.1') OK
+EXPECTED (cues[0].endTime == '1.5') OK
+EXPECTED (cues[0].text == 'Single U+0020 SPACE left of cue-timings separator "-->"') OK
+EXPECTED (cues[1].id == '2') OK
+EXPECTED (cues[1].startTime == '0.1') OK
+EXPECTED (cues[1].endTime == '1.5') OK
+EXPECTED (cues[1].text == 'Single U+0020 SPACE right of cue-timings separator "-->"') OK
+EXPECTED (cues[2].id == '3') OK
+EXPECTED (cues[2].startTime == '0.1') OK
+EXPECTED (cues[2].endTime == '1.5') OK
+EXPECTED (cues[2].text == 'Single U+0009 TAB left of cue-timings separator "-->"') OK
+EXPECTED (cues[3].id == '4') OK
+EXPECTED (cues[3].startTime == '0.1') OK
+EXPECTED (cues[3].endTime == '1.5') OK
+EXPECTED (cues[3].text == 'Single U+0009 TAB right of cue-timings separator "-->"') OK
+EXPECTED (cues[4].id == '5') OK
+EXPECTED (cues[4].startTime == '0.1') OK
+EXPECTED (cues[4].endTime == '1.5') OK
+EXPECTED (cues[4].text == 'Single U+000C FORM FEED left of cue-timings separator "-->"') OK
+EXPECTED (cues[5].id == '6') OK
+EXPECTED (cues[5].startTime == '0.1') OK
+EXPECTED (cues[5].endTime == '1.5') OK
+EXPECTED (cues[5].text == 'Single U+000C FORM FEED right of cue-timings separator "-->"') OK
+EXPECTED (cues[6].id == '7') OK
+EXPECTED (cues[6].startTime == '0.1') OK
+EXPECTED (cues[6].endTime == '1.5') OK
+EXPECTED (cues[6].text == 'Several U+0020 SPACE left of cue-timings separator "-->"') OK
+EXPECTED (cues[7].id == '8') OK
+EXPECTED (cues[7].startTime == '0.1') OK
+EXPECTED (cues[7].endTime == '1.5') OK
+EXPECTED (cues[7].text == 'Several U+0020 SPACE right of cue-timings separator "-->"') OK
+EXPECTED (cues[8].id == '9') OK
+EXPECTED (cues[8].startTime == '0.1') OK
+EXPECTED (cues[8].endTime == '1.5') OK
+EXPECTED (cues[8].text == 'Several U+0009 TAB left of cue-timings separator "-->"') OK
+EXPECTED (cues[9].id == '10') OK
+EXPECTED (cues[9].startTime == '0.1') OK
+EXPECTED (cues[9].endTime == '1.5') OK
+EXPECTED (cues[9].text == 'Several U+0009 TAB right of cue-timings separator "-->"') OK
+EXPECTED (cues[10].id == '11') OK
+EXPECTED (cues[10].startTime == '0.1') OK
+EXPECTED (cues[10].endTime == '1.5') OK
+EXPECTED (cues[10].text == 'Several U+000C FORM FEED left of cue-timings separator "-->"') OK
+EXPECTED (cues[11].id == '12') OK
+EXPECTED (cues[11].startTime == '0.1') OK
+EXPECTED (cues[11].endTime == '1.5') OK
+EXPECTED (cues[11].text == 'Several U+000C FORM FEED right of cue-timings separator "-->"') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackwebvtttc029timingswhitespacehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace.html (0 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace.html (rev 0)
+++ trunk/LayoutTests/media/track/track-webvtt-tc029-timings-whitespace.html 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../media-file.js></script>
+ <script src=../video-test.js></script>
+ <script>
+
+ numberOfTrackTests = 1;
+
+ function trackLoaded()
+ {
+ numberOfTracksLoaded++;
+ if (numberOfTracksLoaded == numberOfTrackTests) {
+ testTrack0();
+ }
+ }
+
+ function testTrack0()
+ {
+ findMediaElement();
+ var expected =
+ {
+ length: 12,
+ tests:
+ [
+ {
+ property: "id",
+ values: ["1","2","3","4","5","6","7","8","9","10","11","12"],
+ },
+ {
+ property: "startTime",
+ values: [ "0.1","0.1","0.1","0.1","0.1","0.1","0.1","0.1","0.1","0.1","0.1","0.1"],
+ },
+ {
+ property: "endTime",
+ values: [ "1.5","1.5","1.5","1.5","1.5","1.5","1.5","1.5","1.5","1.5","1.5","1.5"],
+ },
+ {
+ property: "text",
+ values:
+ [
+ 'Single U+0020 SPACE left of cue-timings separator "-->"',
+ 'Single U+0020 SPACE right of cue-timings separator "-->"',
+ 'Single U+0009 TAB left of cue-timings separator "-->"',
+ 'Single U+0009 TAB right of cue-timings separator "-->"',
+ 'Single U+000C FORM FEED left of cue-timings separator "-->"',
+ 'Single U+000C FORM FEED right of cue-timings separator "-->"',
+ 'Several U+0020 SPACE left of cue-timings separator "-->"',
+ 'Several U+0020 SPACE right of cue-timings separator "-->"',
+ 'Several U+0009 TAB left of cue-timings separator "-->"',
+ 'Several U+0009 TAB right of cue-timings separator "-->"',
+ 'Several U+000C FORM FEED left of cue-timings separator "-->"',
+ 'Several U+000C FORM FEED right of cue-timings separator "-->"',
+ ],
+ },
+ ],
+ };
+ testCues(0, expected);
+
+ allTestsEnded();
+ }
+ </script>
+ </head>
+ <body onload="enableAllTextTracks()">
+ <p>Tests that "Skip whitespace" step around cue-timings separator is working correctly.</p>
+ <video>
+ <track src="captions-webvtt/tc029-timings-whitespace.vtt" onload="trackLoaded()">
+ </video>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165497 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-12 21:02:02 UTC (rev 165497)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-12 Brent Fulgham <bfulgham@apple.com>
+
+ [WebVTT] HTML5 "space" cahracters around "-->" are not required
+ https://bugs.webkit.org/show_bug.cgi?id=117421
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by caitpotter88@gmail.com):
+ https://chromium.googlesource.com/chromium/blink/+/4ef469cd627a13696b88e285ae28a60e38f9c286
+ http://crbug.com/242158
+
+ New tests: media/track/track-webvtt-tc029-timings-whitespace.html
+
+ * html/track/WebVTTParser.cpp:
+ (WebCore::WebVTTParser::collectTimingsAndSettings): Make whitespace around cue-timings optional.
+
</ins><span class="cx"> 2014-03-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r165482.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTParser.cpp (165497 => 165498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/WebVTTParser.cpp 2014-03-12 21:02:02 UTC (rev 165497)
+++ trunk/Source/WebCore/html/track/WebVTTParser.cpp 2014-03-12 21:08:45 UTC (rev 165498)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013 Google Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2013 Cable Television Labs, Inc.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -295,9 +295,7 @@
</span><span class="cx"> return BadCue;
</span><span class="cx"> if (position >= line.length())
</span><span class="cx"> return BadCue;
</span><del>- char nextChar = line[position++];
- if (nextChar != ' ' && nextChar != '\t')
- return BadCue;
</del><ins>+
</ins><span class="cx"> skipWhiteSpace(line, &position);
</span><span class="cx">
</span><span class="cx"> // 6-9 - If the next three characters are not "-->", abort and return failure.
</span><span class="lines">@@ -306,9 +304,7 @@
</span><span class="cx"> position += 3;
</span><span class="cx"> if (position >= line.length())
</span><span class="cx"> return BadCue;
</span><del>- nextChar = line[position++];
- if (nextChar != ' ' && nextChar != '\t')
- return BadCue;
</del><ins>+
</ins><span class="cx"> skipWhiteSpace(line, &position);
</span><span class="cx">
</span><span class="cx"> // 10-11 - Collect a WebVTT timestamp. If that fails, then abort and return failure. Otherwise, let cue's text track cue end time be the collected time.
</span></span></pre>
</div>
</div>
</body>
</html>