Changeset 241203 in webkit

Timestamp:

Feb 8, 2019 11:48:04 AM (5 years ago)

Author:

pvollan@apple.com

Message:

[WebVTT] Inline WebVTT styles should start with '::cue'
​https://bugs.webkit.org/show_bug.cgi?id=194227
<rdar://problem/47791087>

Reviewed by Eric Carlson.

Source/WebCore:

Check that the CSS string starts with '::cue' and is successfully parsed before adding it
to the CSS stylesheet list. Also, the caption preferences CSS string should start with
'::cue', since it is added inside the video shadow root element.

Test: media/track/track-cue-css.html

• html/track/WebVTTParser.cpp:

(WebCore::WebVTTParser::checkAndStoreStyleSheet):

• page/CaptionUserPreferencesMediaAF.cpp:

(WebCore::CaptionUserPreferencesMediaAF::captionsStyleSheetOverride const):

LayoutTests:

• media/track/captions-webvtt/css-styling.vtt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/captions-webvtt/css-styling.vtt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/track/WebVTTParser.cpp (modified) (2 diffs)
• Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-02-08  Per Arne Vollan  <pvollan@apple.com>
+
+        [WebVTT] Inline WebVTT styles should start with '::cue'
+        https://bugs.webkit.org/show_bug.cgi?id=194227
+        <rdar://problem/47791087>
+
+        Reviewed by Eric Carlson.
+
+        * media/track/captions-webvtt/css-styling.vtt:
+
 2019-02-08  Youenn Fablet  <youenn@apple.com>
 

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

@@ -13 +13 @@
 
 STYLE
-video::cue {
+::cue {
 color: green;
 font-size: 15px;
+}
+
+NOTE the following style block has a syntax error.
+
+STYLE
+::cue {
+color: blue
+font-size: 25px;
+}
+
+STYLE
+video::cue {
+color: blue;
+font-size: 25px;
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-08  Per Arne Vollan  <pvollan@apple.com>
+
+        [WebVTT] Inline WebVTT styles should start with '::cue'
+        https://bugs.webkit.org/show_bug.cgi?id=194227
+        <rdar://problem/47791087>
+
+        Reviewed by Eric Carlson.
+
+        Check that the CSS string starts with '::cue' and is successfully parsed before adding it
+        to the CSS stylesheet list. Also, the caption preferences CSS string should start with
+        '::cue', since it is added inside the video shadow root element.
+
+        Test: media/track/track-cue-css.html
+
+        * html/track/WebVTTParser.cpp:
+        (WebCore::WebVTTParser::checkAndStoreStyleSheet):
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::CaptionUserPreferencesMediaAF::captionsStyleSheetOverride const):
+
 2019-02-08  Youenn Fablet  <youenn@apple.com>
 

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

@@ -40 +40 @@
 #include "ISOVTTCue.h"
 #include "ProcessingInstruction.h"
+#include "StyleSheetContents.h"
 #include "Text.h"
 #include "VTTScanner.h"
@@ -368 +369 @@
     if (!line.isEmpty() && !line.contains("-->"))
         return false;
+    
+    auto styleSheet = m_currentStyleSheet.stripWhiteSpace();
+    
+    // Inline VTT styles must start with ::cue.
+    if (!styleSheet.startsWith("::cue")) {
+        m_currentStyleSheet = emptyString();
+        return true;
+    }
+
+    auto contents = StyleSheetContents::create();
+    if (!contents->parseString(styleSheet)) {
+        m_currentStyleSheet = emptyString();
+        return true;
+    }
     
     m_styleSheets.append(WTFMove(m_currentStyleSheet));

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -568 +568 @@
     String background = captionsBackgroundCSS();
     if (!background.isEmpty() || !captionsColor.isEmpty() || !edgeStyle.isEmpty() || !fontName.isEmpty()) {
-        captionsOverrideStyleSheet.appendLiteral(" video::");
+        captionsOverrideStyleSheet.appendLiteral(" ::");
         captionsOverrideStyleSheet.append(TextTrackCue::cueShadowPseudoId());
         captionsOverrideStyleSheet.append('{');
@@ -587 +587 @@
     String windowCornerRadius = windowRoundedCornerRadiusCSS();
     if (!windowColor.isEmpty() || !windowCornerRadius.isEmpty()) {
-        captionsOverrideStyleSheet.appendLiteral(" video::");
+        captionsOverrideStyleSheet.appendLiteral(" ::");
         captionsOverrideStyleSheet.append(VTTCue::cueBackdropShadowPseudoId());
         captionsOverrideStyleSheet.append('{');