Changeset 139803 in webkit

Timestamp:

Jan 15, 2013 3:49:31 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Implement matching by the voice attribute for WebVTT ::cue pseudo element
​https://bugs.webkit.org/show_bug.cgi?id=106762

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

Source/WebCore:

Implemented matching cue WebVTT elements by a voice attribute by adding a WebVTT specific voice attribute.
For DOM trees title attribute is used instead as this is required by specs.

• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::copyWebVTTNodeToDOMTree): set a title argument instead of a voice attribute for the DOM tree.

• html/track/TextTrackCue.h:

(WebCore::TextTrackCue::voiceAttributeName):

• html/track/WebVTTParser.cpp:

(WebCore::WebVTTParser::constructTreeFromToken):

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-15  Dima Gorbik  <dgorbik@apple.com>
+
+        Implement matching by the voice attribute for WebVTT ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=106762
+
+        Reviewed by Eric Carlson.
+
+        * media/track/captions-webvtt/styling.vtt:
+        * media/track/track-css-matching-expected.txt:
+        * media/track/track-css-matching.html:
+
 2013-01-15  Levi Weintraub  <leviw@chromium.org>
 

trunk/LayoutTests/media/track/captions-webvtt/styling.vtt

@@ -20 +20 @@
 00:01.200 --> 00:01.400
 <c>Aliquam sollicitudin</c> <v>massa ac magna vulputate dignissim</v> <b>posuere et fermentum</b>
+
+5
+00:01.400 --> 00:01.600
+<v>Aliquam sollicitudin</v> <v Mark>massa ac magna vulputate dignissim</v> <v Nancy>posuere et fermentum</v>
+

trunk/LayoutTests/media/track/track-css-matching-expected.txt

@@ -46 +46 @@
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
+
+RUN(video.currentTime = 1.5)
+EVENT(seeked)
+
+
+5. Test that cues are being matched properly by the voice attribute.
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 255, 0)') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
 END OF TEST
 

trunk/LayoutTests/media/track/track-css-matching.html

@@ -11 +11 @@
         video::cue(c) {color: purple}
         video::cue(v) {color: yellow}
+        video::cue(v[voice="Mark"]) {color: red}
+        video::cue(v[voice="Nancy"]) {color: green}
         video::cue(b) {color: lime}
         video::cue(.red, .red2) { color:red }
@@ -22 +24 @@
         var cueNode;
         var seekedCount = 0;
-        var seekTimes = [0.3, 0.5, 0.7, 0.9, 1.1, 1.3];
+        var seekTimes = [0.3, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5];
 
         var info = [["rgb(255, 0, 0)", "rgb(0, 128, 0)", "rgb(255, 0, 0)"],
@@ -29 +31 @@
                     ["rgb(128, 0, 128)", "rgb(128, 0, 128)", "rgb(128, 0, 128)"],
                     ["rgb(128, 0, 128)", "rgb(255, 255, 0)", "rgb(0, 255, 0)"],
-                    ["rgb(0, 128, 0)", "rgb(0, 128, 0)", "rgb(0, 128, 0)"]];
+                    ["rgb(0, 128, 0)", "rgb(0, 128, 0)", "rgb(0, 128, 0)"],
+                    ["rgb(255, 255, 0)", "rgb(255, 0, 0)", "rgb(0, 128, 0)"]];
 
         var description = ["1. Test that cues are being matched properly by the class name",
                            "2. Test that cues are being matched properly by the ':future' pseudo class.", "", "",
                            "3. Test that cues are being matched properly by tag.",
-                           "4. Test that cues are being matched properly by id."];
+                           "4. Test that cues are being matched properly by id.",
+                           "5. Test that cues are being matched properly by the voice attribute."];
 
         function skipNonElements(root)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  Dima Gorbik  <dgorbik@apple.com>
+        Implement matching by the voice attribute for WebVTT ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=106762
+
+        Reviewed by Eric Carlson.
+
+        Implemented matching cue WebVTT elements by a voice attribute by adding a WebVTT specific voice attribute.
+        For DOM trees title attribute is used instead as this is required by specs.
+
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::copyWebVTTNodeToDOMTree): set a title argument instead of a voice attribute for the DOM tree.
+        * html/track/TextTrackCue.h:
+        (WebCore::TextTrackCue::voiceAttributeName):
+        * html/track/WebVTTParser.cpp:
+        (WebCore::WebVTTParser::constructTreeFromToken):
+
 2013-01-15  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -496 +496 @@
             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(titleAttr));
+            toElement(clonedNode.get())->setAttribute(titleAttr, toElement(node)->getAttribute(voiceAttributeName()));
         } else
             clonedNode = node->cloneNode(false);

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

@@ -90 +90 @@
         return cTag;
     }
+    
+    static const QualifiedName& voiceAttributeName()
+    {
+        DEFINE_STATIC_LOCAL(QualifiedName, voiceAttr, (nullAtom, "voice", nullAtom));
+        return voiceAttr;
+    }
 
     virtual ~TextTrackCue();

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

@@ -368 +368 @@
                 child->setAttribute(classAttr, AtomicString(m_token.classes().data(), m_token.classes().size()));
             if (child->hasTagName(TextTrackCue::voiceElementTagName()))
-                child->setAttribute(titleAttr, AtomicString(m_token.annotation().data(), m_token.annotation().size()));
+                child->setAttribute(TextTrackCue::voiceAttributeName(), AtomicString(m_token.annotation().data(), m_token.annotation().size()));
             m_currentNode->parserAppendChild(child);
             m_currentNode = child;