Attachment 221697 Details for Bug 85112 – Proposed patch

[patch] Proposed patch

patch_1.txt (text/plain), 6.51 KB, created by Eric Carlson on 2014-01-20 15:17:43 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2014-01-20 15:17:43 PST

Size: 6.51 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 162379)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2014-01-20  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 NOBODY (OOPS!).
>+
>+        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.
>+
> 2014-01-20  Jeremy Jones  <jeremyj@apple.com>
> 
>         Add AVKit fullscreen video interface.
>Index: Source/WebCore/html/track/WebVTTTokenizer.cpp
>===================================================================
>--- Source/WebCore/html/track/WebVTTTokenizer.cpp	(revision 162339)
>+++ Source/WebCore/html/track/WebVTTTokenizer.cpp	(working copy)
>@@ -35,6 +35,7 @@
> #include "WebVTTTokenizer.h"
> 
> #include "MarkupTokenizerInlines.h"
>+#include <wtf/unicode/CharacterNames.h>
> 
> namespace WebCore {
> 
>@@ -107,6 +108,12 @@ bool WebVTTTokenizer::nextToken(Segmente
>                 bufferCharacter('<');
>             else if (vectorEqualsString(m_buffer, "&gt"))
>                 bufferCharacter('>');
>+            else if (vectorEqualsString(m_buffer, "&lrm"))
>+                bufferCharacter(leftToRightMark);
>+            else if (vectorEqualsString(m_buffer, "&rlm"))
>+                bufferCharacter(rightToLeftMark);
>+            else if (vectorEqualsString(m_buffer, "&nbsp"))
>+                bufferCharacter(noBreakSpace);
>             else {
>                 m_buffer.append(static_cast<LChar>(cc));
>                 m_token->appendToCharacter(m_buffer);
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 162379)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2014-01-20  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 NOBODY (OOPS!).
>+
>+        * media/track/captions-webvtt/tc022-entities.vtt:
>+        * media/track/track-webvtt-tc022-entities-expected.txt:
>+        * media/track/track-webvtt-tc022-entities.html:
>+
> 2014-01-20  Alexey Proskuryakov  <ap@apple.com>
> 
>         svg/filters/feComponentTransfer-style-crash.xhtml is flaky
>Index: LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt
>===================================================================
>--- LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt	(revision 162339)
>+++ LayoutTests/media/track/track-webvtt-tc022-entities-expected.txt	(working copy)
>@@ -3,10 +3,13 @@ Tests special characters &, <, and > in 
> 
> 
> *** Testing text track 0
>-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
>+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
> 
> *** Testing text track 1
> EXPECTED (cues.length == '3') OK
>Index: LayoutTests/media/track/track-webvtt-tc022-entities.html
>===================================================================
>--- LayoutTests/media/track/track-webvtt-tc022-entities.html	(revision 162339)
>+++ LayoutTests/media/track/track-webvtt-tc022-entities.html	(working copy)
>@@ -24,14 +24,19 @@
>                 findMediaElement();
>                 var expected = 
>                 {
>-                    length : 3,
>+                    length : 6,
>                     tests:
>                     [
>                         {
>                             property : "getCueAsHTML().textContent",
>-                            values : ["This cue has an amp & character.",
>-                                      "This cue has a less than < character.",
>-                                      "This cue has a greater than > character."],
>+                            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"
>+                                     ],
>                         },
>                     ],
>                 };
>Index: LayoutTests/media/track/captions-webvtt/tc022-entities.vtt
>===================================================================
>--- LayoutTests/media/track/captions-webvtt/tc022-entities.vtt	(revision 162339)
>+++ LayoutTests/media/track/captions-webvtt/tc022-entities.vtt	(working copy)
>@@ -1,14 +1,26 @@
> WEBVTT
>-Cue content with escape characters for &, <, and >.
>+Cue content with escape characters for &, <, >, LRM, RLM and non-breaking space.
> 
> 1
> 00:00:00.000 --> 00:00:30.500 align:start position:20%
>-This cue has an amp &amp; character.
>+This cue has an amp character: &amp;
> 
> 2
> 00:00:31.000 --> 00:01:00.500 align:start position:20%
>-This cue has a less than &lt; character.
>+This cue has a less than character: &lt;
> 
> 3
> 00:01:01.000 --> 00:02:00.500 align:start position:20%
>-This cue has a greater than &gt; character.
>+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;
>\ No newline at end of file

Actions: View | Formatted Diff | Diff

Attachments on bug 85112: 221697