Changeset 140877 in webkit

Timestamp:

Jan 25, 2013 4:20:45 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Support language WebVTT Nodes
​https://bugs.webkit.org/show_bug.cgi?id=107907

Patch by Dima Gorbik <​dgorbik@apple.com> on 2013-01-25
Reviewed by Eric Carlson.

Source/WebCore:

Language stack and WebVTT language nodes are added as
required by specs.

Test: media/track/track-css-matching-lang.html

• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::copyWebVTTNodeToDOMTree): WebVTT language nodes should be
spans in DOM and the lang attribute should be set for all nodes if applicable.

• html/track/TextTrackCue.h:

(WebCore::TextTrackCue::langElementTagName):
(TextTrackCue):
(WebCore::TextTrackCue::langAttributeName):

• html/track/WebVTTParser.cpp:

(WebCore::WebVTTParser::createDocumentFragmentFromCueText): clear the language stack in case
we use the same parser object for multiple cues that have incorrect syntax.
(WebCore::isLangToken):
(WebCore):
(WebCore::WebVTTParser::constructTreeFromToken): parse lang WebVTT objects.

• html/track/WebVTTParser.h:

(WebVTTParser):

LayoutTests:

• media/track/captions-webvtt/styling-lang.vtt: Added.
• media/track/track-css-matching-lang-expected.txt: Added.
• media/track/track-css-matching-lang.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/captions-webvtt/styling-lang.vtt (added)
• LayoutTests/media/track/track-css-matching-lang-expected.txt (added)
• LayoutTests/media/track/track-css-matching-lang.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCue.cpp (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCue.h (modified) (2 diffs)
• Source/WebCore/html/track/WebVTTParser.cpp (modified) (5 diffs)
• Source/WebCore/html/track/WebVTTParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-25  Dima Gorbik  <dgorbik@apple.com>
+
+        Support language WebVTT Nodes
+        https://bugs.webkit.org/show_bug.cgi?id=107907
+
+        Reviewed by Eric Carlson.
+
+        * media/track/captions-webvtt/styling-lang.vtt: Added.
+        * media/track/track-css-matching-lang-expected.txt: Added.
+        * media/track/track-css-matching-lang.html: Added.
+
 2013-01-25  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-25  Dima Gorbik  <dgorbik@apple.com>
+
+        Support language WebVTT Nodes
+        https://bugs.webkit.org/show_bug.cgi?id=107907
+
+        Reviewed by Eric Carlson.
+
+        Language stack and WebVTT language nodes are added as 
+        required by specs.
+
+        Test: media/track/track-css-matching-lang.html
+
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::copyWebVTTNodeToDOMTree): WebVTT language nodes should be
+        spans in DOM and the lang attribute should be set for all nodes if applicable.
+        * html/track/TextTrackCue.h:
+        (WebCore::TextTrackCue::langElementTagName):
+        (TextTrackCue):
+        (WebCore::TextTrackCue::langAttributeName):
+        * html/track/WebVTTParser.cpp:
+        (WebCore::WebVTTParser::createDocumentFragmentFromCueText): clear the language stack in case
+        we use the same parser object for multiple cues that have incorrect syntax.
+        (WebCore::isLangToken):
+        (WebCore):
+        (WebCore::WebVTTParser::constructTreeFromToken): parse lang WebVTT objects.
+        * html/track/WebVTTParser.h:
+        (WebVTTParser):
+
 2013-01-25  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/html/track/TextTrackCue.cpp

@@ -505 +505 @@
         RefPtr<Node> clonedNode;
         // Specs require voice and class WebVTT elements to be spans for DOM trees.
-        if (node->hasTagName(voiceElementTagName()) || node->hasTagName(classElementTagName())) {
+        if (node->hasTagName(voiceElementTagName()) || node->hasTagName(classElementTagName()) || node->hasTagName(langElementTagName())) {
             clonedNode = HTMLSpanElement::create(spanTag, static_cast<Document*>(m_scriptExecutionContext));
             toElement(clonedNode.get())->setAttribute(classAttr, toElement(node)->getAttribute(classAttr));
             toElement(clonedNode.get())->setAttribute(titleAttr, toElement(node)->getAttribute(voiceAttributeName()));
+            toElement(clonedNode.get())->setAttribute(langAttr, toElement(node)->getAttribute(langAttributeName()));
         } else
             clonedNode = node->cloneNode(false);

trunk/Source/WebCore/html/track/TextTrackCue.h

@@ -86 +86 @@
     }
 
+    static const QualifiedName& langElementTagName()
+    {
+        DEFINE_STATIC_LOCAL(QualifiedName, langTag, (nullAtom, "lang", nullAtom));
+        return langTag;
+    }
+
     static const QualifiedName& voiceElementTagName()
     {
@@ -97 +103 @@
         return cTag;
     }
-    
+
     static const QualifiedName& voiceAttributeName()
     {
         DEFINE_STATIC_LOCAL(QualifiedName, voiceAttr, (nullAtom, "voice", nullAtom));
+        return voiceAttr;
+    }
+
+    static const QualifiedName& langAttributeName()
+    {
+        DEFINE_STATIC_LOCAL(QualifiedName, voiceAttr, (nullAtom, "lang", nullAtom));
         return voiceAttr;
     }

trunk/Source/WebCore/html/track/WebVTTParser.cpp

@@ -252 +252 @@
     m_token.clear();
     
+    m_languageStack.clear();
     SegmentedString content(text);
     while (m_tokenizer->nextToken(content, m_token))
@@ -342 +343 @@
 }
 
+static inline bool isLangToken(WebVTTToken& token)
+{
+    return token.name().size() == 4 && token.name()[0] == 'l' && token.name()[1] == 'a' && token.name()[2] == 'n' && token.name()[3] == 'g';
+}
+
 void WebVTTParser::constructTreeFromToken(Document* document)
 {
@@ -364 +370 @@
         else if (m_token.name().size() == 1 && m_token.name()[0] == 'v')
             child = WebVTTElement::create(TextTrackCue::voiceElementTagName(), document);
+        else if (isLangToken(m_token))
+            child = WebVTTElement::create(TextTrackCue::langElementTagName(), document);
 
         if (child) {
@@ -370 +378 @@
             if (child->hasTagName(TextTrackCue::voiceElementTagName()))
                 child->setAttribute(TextTrackCue::voiceAttributeName(), AtomicString(m_token.annotation().data(), m_token.annotation().size()));
+            if (child->hasTagName(TextTrackCue::langElementTagName()))
+                m_languageStack.append(AtomicString(m_token.annotation().data(), m_token.annotation().size()));
+            if (!m_languageStack.isEmpty())
+                child->setAttribute(TextTrackCue::langAttributeName(), m_languageStack.last());
             m_currentNode->parserAppendChild(child);
             m_currentNode = child;
@@ -379 +391 @@
             || (m_token.name().size() == 1 && m_token.name()[0] == 'c')
             || (m_token.name().size() == 1 && m_token.name()[0] == 'v')) {
+            if (m_currentNode->parentNode())
+                m_currentNode = m_currentNode->parentNode();
+        }
+        if (isLangToken(m_token)) {
+            if (m_currentNode->hasTagName(TextTrackCue::langElementTagName()))
+                m_languageStack.removeLast();
             if (m_currentNode->parentNode())
                 m_currentNode = m_currentNode->parentNode();

trunk/Source/WebCore/html/track/WebVTTParser.h

@@ -134 +134 @@
     WebVTTParserClient* m_client;
 
+    Vector<AtomicString> m_languageStack;
     Vector<RefPtr<TextTrackCue> > m_cuelist;
 };