Changeset 141795 in webkit

Timestamp:

Feb 4, 2013 1:00:26 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Implemet :lang() pseudo class support for the WebVTT ::cue pseudo element
​https://bugs.webkit.org/show_bug.cgi?id=105478

Patch by Dima Gorbik <​dgorbik@apple.com> on 2013-02-04
Reviewed by Antti Koivisto.

Source/WebCore:

In WebVTT lang is preprocessed and stored in the lang attribute of the element,
so we access it instead of walking up the tree the way it is done in HTML.

Existing tests were modified to cover this case.

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne):

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-04  Dima Gorbik  <dgorbik@apple.com>
+
+        Implemet :lang() pseudo class support for the WebVTT ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=105478
+
+        Reviewed by Antti Koivisto.
+
+        * media/track/captions-webvtt/styling-lang.vtt:
+        * media/track/track-css-matching-lang-expected.txt:
+        * media/track/track-css-matching-lang.html:
+
 2013-02-04  Tom Sepez  <tsepez@chromiium.org>
 

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

@@ -2 +2 @@
 
 1
-00:00.000 --> 00:01.000
+00:00.000 --> 00:00.500
 <lang en><c>English<lang ru><c> Русский<lang en><c> English again</c></lang></c></lang></c></lang>
+
+2
+00:00.500 --> 00:01.000
+<lang en><i>English<lang ru><b> Русский<lang en><u> English again</u></lang></b></lang></i></lang>

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

@@ -5 +5 @@
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
 EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 128, 0)') OK
+
+RUN(video.currentTime = 0.6)
+EVENT(seeked)
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(128, 0, 128)') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(0, 255, 0)') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(128, 0, 128)') OK
 END OF TEST
 

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

@@ -9 +9 @@
 
         <style>
+        ::cue(:lang(ru)) { color: lime; }
+        ::cue(:lang(en)) { color: purple; }
         ::cue(c[lang="ru"]) { color: red; }
         ::cue(c[lang="en"]) { color: green; }
@@ -17 +19 @@
         var cueNode;
         var seekedCount = 0;
-        var seekTimes = [0.1];
+        var seekTimes = [0.1, 0.6];
 
-        var info = [["rgb(0, 128, 0)", "rgb(255, 0, 0)", "rgb(0, 128, 0)"]];
+        var info = [["rgb(0, 128, 0)", "rgb(255, 0, 0)", "rgb(0, 128, 0)"],
+                    ["rgb(128, 0, 128)", "rgb(0, 255, 0)", "rgb(128, 0, 128)"]];
 
         function seeked()

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-04  Dima Gorbik  <dgorbik@apple.com>
+
+        Implemet :lang() pseudo class support for the WebVTT ::cue pseudo element
+        https://bugs.webkit.org/show_bug.cgi?id=105478
+
+        Reviewed by Antti Koivisto.
+
+        In WebVTT lang is preprocessed and stored in the lang attribute of the element, 
+        so we access it instead of walking up the tree the way it is done in HTML.
+
+        Existing tests were modified to cover this case.
+
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne):
+
 2013-02-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -820 +820 @@
         case CSSSelector::PseudoLang:
             {
-                AtomicString value = element->computeInheritedLanguage();
+                AtomicString value;
+#if ENABLE(VIDEO_TRACK)
+                if (element->isWebVTTElement())
+                    value = element->getAttribute(langAttr);
+                else
+#endif
+                    value = element->computeInheritedLanguage();
                 const AtomicString& argument = selector->argument();
                 if (value.isEmpty() || !value.startsWith(argument, false))