Changeset 139714 in webkit

Timestamp:

Jan 14, 2013 9:22:43 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Implement ID selector matching for the WebVTT ::cue pseudo element
​https://bugs.webkit.org/show_bug.cgi?id=105481

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

Source/WebCore:

Implemented matching cue WebVTT elements by an identifier. Identifiers of all WebVTT nodes in the rendering tree for
a given cue are set to match the cue identifier.

Existing tests were modified to cover this case.

• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::markFutureAndPastNodes):

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) (2 diffs)
• LayoutTests/media/track/track-css-matching.html (modified) (5 diffs)
• Source/WebCore/ChangeLog (modified) (2 diffs)
• Source/WebCore/html/track/TextTrackCue.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-14  Dima Gorbik  <dgorbik@apple.com>
+
+        Implement ID selector matching for the WebVTT ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=105481
+
+        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-14  Dominic Cooney   <dominicc@chromium.org>
 

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

@@ -16 +16 @@
 00:01.000 --> 00:01.200
 <c>Aliquam sollicitudin</c> <v>massa ac magna vulputate dignissim</v> <b>posuere et fermentum</b>
+
+testcue
+00:01.200 --> 00:01.400
+<c>Aliquam sollicitudin</c> <v>massa ac magna vulputate dignissim</v> <b>posuere et fermentum</b>

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

@@ -1 @@
-1. Test that cues are being matched properly by the class name
 EVENT(canplaythrough)
 EVENT(seeked)
+
+
+1. Test that cues are being matched properly by the class name
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
@@ -35 +37 @@
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 255, 0)') OK
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 255, 0)') OK
+
+RUN(video.currentTime = 1.3)
+EVENT(seeked)
+
+
+4. Test that cues are being matched properly by id.
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
 END OF TEST
 

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

@@ -14 +14 @@
         video::cue(.red, .red2) { color:red }
         #testvideo::cue(.green) { color:green }
+        video::cue(#testcue) {color: green}
         video::cue(:future) {color: gray}
         </style>
@@ -21 +22 @@
         var cueNode;
         var seekedCount = 0;
+        var seekTimes = [0.3, 0.5, 0.7, 0.9, 1.1, 1.3];
+
         var info = [["rgb(255, 0, 0)", "rgb(0, 128, 0)", "rgb(255, 0, 0)"],
                     ["rgb(128, 0, 128)", "rgb(128, 128, 128)", "rgb(128, 128, 128)"],
                     ["rgb(128, 0, 128)", "rgb(128, 0, 128)", "rgb(128, 128, 128)"],
                     ["rgb(128, 0, 128)", "rgb(128, 0, 128)", "rgb(128, 0, 128)"],
-                    ["rgb(128, 0, 128)", "rgb(255, 255, 0)", "rgb(0, 255, 0)"]];
-        var seekTimes = [0.3, 0.5, 0.7, 0.9, 1.1, 1.3];
+                    ["rgb(128, 0, 128)", "rgb(255, 255, 0)", "rgb(0, 255, 0)"],
+                    ["rgb(0, 128, 0)", "rgb(0, 128, 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."];
 
         function skipNonElements(root)
@@ -36 +44 @@
             return nextElementSibling;
         }
-        
+
         function seeked()
         {
@@ -42 +50 @@
                 return;
 
-            if (seekedCount == 1) {
-                consoleWrite("");
-                consoleWrite("");
-                consoleWrite("2. Test that cues are being matched properly by the ':future' pseudo class.");
-            } else if (seekedCount == 4) {
-                consoleWrite("");
-                consoleWrite("");
-                consoleWrite("3. Test that cues are being matched properly by tag.");
+            if (description[seekedCount] != "") {
+                consoleWrite("<br>");
+                consoleWrite(description[seekedCount]);
             }
 
@@ -70 +73 @@
         function loaded()
         {
-            consoleWrite("1. Test that cues are being matched properly by the class name");
             findMediaElement();
             video.src = findMediaFile('video', '../content/test');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-14  Dima Gorbik  <dgorbik@apple.com>
+
+        Implement ID selector matching for the WebVTT ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=105481
+
+        Reviewed by Eric Carlson.
+
+        Implemented matching cue WebVTT elements by an identifier. Identifiers of all WebVTT nodes in the rendering tree for 
+        a given cue are set to match the cue identifier.
+
+        Existing tests were modified to cover this case.
+
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::markFutureAndPastNodes):
+
 2013-01-14  Mark Pilgrim  <pilgrim@chromium.org>
 
@@ -126 +141 @@
         * rendering/RenderListItem.h:
 
-2013-01-14  Dima Gorbik  <dgorbik@apple.com>
+2013-01-13  Dima Gorbik  <dgorbik@apple.com>
 
         Implement element type selectors for the WebVTT ::cue pseudo class

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

@@ -695 +695 @@
                 isPastNode = false;
         }
-
-        if (child->isElementNode())
+        
+        if (child->isElementNode()) {
             toElement(child)->setWebVTTNodeType(isPastNode ? WebVTTNodeTypePast : WebVTTNodeTypeFuture);
+            // Make an elemenet id match a cue id for style matching purposes.
+            if (!m_id.isEmpty())
+                toElement(child)->setIdAttribute(AtomicString(m_id.characters(), m_id.length()));
+        }
     }
 }