<!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>[162450] 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/162450">162450</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-01-21 10:44:03 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add &lrm; &rlm; and &nbsp; to WebVTT parser
https://bugs.webkit.org/show_bug.cgi?id=85112
Reviewed by Jer Noble.
Source/WebCore:
No new tests, track-webvtt-tc022-entities.html was updated to test this.
* html/track/WebVTTTokenizer.cpp:
(WebCore::WebVTTTokenizer::nextToken): Support RLM, LRM, and NBSP entities.
LayoutTests:
* media/track/captions-webvtt/tc022-entities.vtt:
* media/track/track-webvtt-tc022-entities-expected.txt:
* media/track/track-webvtt-tc022-entities.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvtttc022entitiesvtt">trunk/LayoutTests/media/track/captions-webvtt/tc022-entities.vtt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackwebvtttc022entitiesexpectedtxt">trunk/LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackwebvtttc022entitieshtml">trunk/LayoutTests/media/track/track-webvtt-tc022-entities.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTTokenizercpp">trunk/Source/WebCore/html/track/WebVTTTokenizer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162449 => 162450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-21 18:30:18 UTC (rev 162449)
+++ trunk/LayoutTests/ChangeLog 2014-01-21 18:44:03 UTC (rev 162450)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-21 Eric Carlson <eric.carlson@apple.com>
+
+ Add &lrm; &rlm; and &nbsp; to WebVTT parser
+ https://bugs.webkit.org/show_bug.cgi?id=85112
+
+ Reviewed by Jer Noble.
+
+ * media/track/captions-webvtt/tc022-entities.vtt:
+ * media/track/track-webvtt-tc022-entities-expected.txt:
+ * media/track/track-webvtt-tc022-entities.html:
+
</ins><span class="cx"> 2014-01-21 Mihai Tica <mitica@adobe.com>
</span><span class="cx">
</span><span class="cx"> If you set a tiled cross-faded-image or a tiled gradient as
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvtttc022entitiesvtt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/captions-webvtt/tc022-entities.vtt (162449 => 162450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/tc022-entities.vtt 2014-01-21 18:30:18 UTC (rev 162449)
+++ trunk/LayoutTests/media/track/captions-webvtt/tc022-entities.vtt 2014-01-21 18:44:03 UTC (rev 162450)
</span><span class="lines">@@ -1,14 +1,26 @@
</span><span class="cx"> WEBVTT
</span><del>-Cue content with escape characters for &, <, and >.
</del><ins>+Cue content with escape characters for &, <, >, LRM, RLM and non-breaking space.
</ins><span class="cx">
</span><span class="cx"> 1
</span><span class="cx"> 00:00:00.000 --> 00:00:30.500 align:start position:20%
</span><del>-This cue has an amp &amp; character.
</del><ins>+This cue has an amp character: &amp;
</ins><span class="cx">
</span><span class="cx"> 2
</span><span class="cx"> 00:00:31.000 --> 00:01:00.500 align:start position:20%
</span><del>-This cue has a less than &lt; character.
</del><ins>+This cue has a less than character: &lt;
</ins><span class="cx">
</span><span class="cx"> 3
</span><span class="cx"> 00:01:01.000 --> 00:02:00.500 align:start position:20%
</span><del>-This cue has a greater than &gt; character.
</del><ins>+This cue has a greater than character: &gt;
+
+4
+00:02:01.000 --> 00:03:00.500 align:start position:20%
+This cue has a right-to-left mark (RLM): &rlm;
+
+5
+00:03:01.000 --> 00:04:00.500 align:start position:20%
+This cue has a left-to-right mark (LRM): &lrm;
+
+6
+00:04:01.000 --> 00:05:00.500 align:start position:20%
+This cue has a non-breakable space (NBSP): &nbsp;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackwebvtttc022entitiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt (162449 => 162450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt 2014-01-21 18:30:18 UTC (rev 162449)
+++ trunk/LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt 2014-01-21 18:44:03 UTC (rev 162450)
</span><span class="lines">@@ -3,10 +3,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> *** Testing text track 0
</span><del>-EXPECTED (cues.length == '3') OK
-EXPECTED (cues[0].getCueAsHTML().textContent == 'This cue has an amp & character.') OK
-EXPECTED (cues[1].getCueAsHTML().textContent == 'This cue has a less than < character.') OK
-EXPECTED (cues[2].getCueAsHTML().textContent == 'This cue has a greater than > character.') OK
</del><ins>+EXPECTED (cues.length == '6') OK
+EXPECTED (cues[0].getCueAsHTML().textContent == 'This cue has an amp character: &') OK
+EXPECTED (cues[1].getCueAsHTML().textContent == 'This cue has a less than character: <') OK
+EXPECTED (cues[2].getCueAsHTML().textContent == 'This cue has a greater than character: >') OK
+EXPECTED (cues[3].getCueAsHTML().textContent == 'This cue has a right-to-left mark (RLM): ') OK
+EXPECTED (cues[4].getCueAsHTML().textContent == 'This cue has a left-to-right mark (LRM): ') OK
+EXPECTED (cues[5].getCueAsHTML().textContent == 'This cue has a non-breakable space (NBSP): ') OK
</ins><span class="cx">
</span><span class="cx"> *** Testing text track 1
</span><span class="cx"> EXPECTED (cues.length == '3') OK
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackwebvtttc022entitieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-webvtt-tc022-entities.html (162449 => 162450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-webvtt-tc022-entities.html 2014-01-21 18:30:18 UTC (rev 162449)
+++ trunk/LayoutTests/media/track/track-webvtt-tc022-entities.html 2014-01-21 18:44:03 UTC (rev 162450)
</span><span class="lines">@@ -24,14 +24,19 @@
</span><span class="cx"> findMediaElement();
</span><span class="cx"> var expected =
</span><span class="cx"> {
</span><del>- length : 3,
</del><ins>+ length : 6,
</ins><span class="cx"> tests:
</span><span class="cx"> [
</span><span class="cx"> {
</span><span class="cx"> property : "getCueAsHTML().textContent",
</span><del>- values : ["This cue has an amp & character.",
- "This cue has a less than < character.",
- "This cue has a greater than > character."],
</del><ins>+ values : [
+ "This cue has an amp character: \u0026",
+ "This cue has a less than character: \u003C",
+ "This cue has a greater than character: \u003E",
+ "This cue has a right-to-left mark (RLM): \u200f",
+ "This cue has a left-to-right mark (LRM): \u200e",
+ "This cue has a non-breakable space (NBSP): \u00a0"
+ ],
</ins><span class="cx"> },
</span><span class="cx"> ],
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162449 => 162450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-21 18:30:18 UTC (rev 162449)
+++ trunk/Source/WebCore/ChangeLog 2014-01-21 18:44:03 UTC (rev 162450)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-21 Eric Carlson <eric.carlson@apple.com>
+
+ Add &lrm; &rlm; and &nbsp; to WebVTT parser
+ https://bugs.webkit.org/show_bug.cgi?id=85112
+
+ Reviewed by Jer Noble.
+
+ No new tests, track-webvtt-tc022-entities.html was updated to test this.
+
+ * html/track/WebVTTTokenizer.cpp:
+ (WebCore::WebVTTTokenizer::nextToken): Support RLM, LRM, and NBSP entities.
+
</ins><span class="cx"> 2014-01-21 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r162354.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTTokenizercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTTokenizer.cpp (162449 => 162450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/WebVTTTokenizer.cpp 2014-01-21 18:30:18 UTC (rev 162449)
+++ trunk/Source/WebCore/html/track/WebVTTTokenizer.cpp 2014-01-21 18:44:03 UTC (rev 162450)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "WebVTTTokenizer.h"
</span><span class="cx">
</span><span class="cx"> #include "MarkupTokenizerInlines.h"
</span><ins>+#include <wtf/unicode/CharacterNames.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -107,6 +108,12 @@
</span><span class="cx"> bufferCharacter('<');
</span><span class="cx"> else if (vectorEqualsString(m_buffer, "&gt"))
</span><span class="cx"> bufferCharacter('>');
</span><ins>+ else if (vectorEqualsString(m_buffer, "&lrm"))
+ bufferCharacter(leftToRightMark);
+ else if (vectorEqualsString(m_buffer, "&rlm"))
+ bufferCharacter(rightToLeftMark);
+ else if (vectorEqualsString(m_buffer, "&nbsp"))
+ bufferCharacter(noBreakSpace);
</ins><span class="cx"> else {
</span><span class="cx"> m_buffer.append(static_cast<LChar>(cc));
</span><span class="cx"> m_token->appendToCharacter(m_buffer);
</span></span></pre>
</div>
</div>
</body>
</html>