Attachment 361081 Details for Bug 194227 – Patch

[patch] Patch

bug-194227-20190204115636.patch (text/plain), 4.61 KB, created by Per Arne Vollan on 2019-02-04 11:56:37 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2019-02-04 11:56:37 PST

Size: 4.61 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 240935)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,21 @@
>+2019-02-04  Per Arne Vollan  <pvollan@apple.com>
>+
>+        [WebVTT] Inline WebVTT styles should start with '::cue'
>+        https://bugs.webkit.org/show_bug.cgi?id=194227
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-04  Sihui Liu  <sihui_liu@apple.com>
> 
>         IndexedDB: leak WebIDBConnectionToServer in layout tests
>Index: Source/WebCore/html/track/WebVTTParser.cpp
>===================================================================
>--- Source/WebCore/html/track/WebVTTParser.cpp	(revision 240927)
>+++ Source/WebCore/html/track/WebVTTParser.cpp	(working copy)
>@@ -39,6 +39,7 @@
> #include "HTMLParserIdioms.h"
> #include "ISOVTTCue.h"
> #include "ProcessingInstruction.h"
>+#include "StyleSheetContents.h"
> #include "Text.h"
> #include "VTTScanner.h"
> #include "WebVTTElement.h"
>@@ -368,6 +369,21 @@ bool WebVTTParser::checkAndStoreStyleShe
>     if (!line.isEmpty() && !line.contains("-->"))
>         return false;
>     
>+    auto styleSheet = m_currentStyleSheet.stripWhiteSpace();
>+    
>+    // Check that stylesheet starts with "::cue".
>+    if (!styleSheet.startsWith("::cue")) {
>+        m_currentStyleSheet = emptyString();
>+        return true;
>+    }
>+    
>+    // Check that stylesheet can be parsed.
>+    auto contents = StyleSheetContents::create();
>+    if (!contents->parseString(styleSheet)) {
>+        m_currentStyleSheet = emptyString();
>+        return true;
>+    }
>+    
>     m_styleSheets.append(WTFMove(m_currentStyleSheet));
>     return true;
> }
>Index: Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
>===================================================================
>--- Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp	(revision 240927)
>+++ Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp	(working copy)
>@@ -567,7 +567,7 @@ String CaptionUserPreferencesMediaAF::ca
>     String fontName = captionsDefaultFontCSS();
>     String background = captionsBackgroundCSS();
>     if (!background.isEmpty() || !captionsColor.isEmpty() || !edgeStyle.isEmpty() || !fontName.isEmpty()) {
>-        captionsOverrideStyleSheet.appendLiteral(" video::");
>+        captionsOverrideStyleSheet.appendLiteral(" ::");
>         captionsOverrideStyleSheet.append(TextTrackCue::cueShadowPseudoId());
>         captionsOverrideStyleSheet.append('{');
>         
>@@ -586,7 +586,7 @@ String CaptionUserPreferencesMediaAF::ca
>     String windowColor = captionsWindowCSS();
>     String windowCornerRadius = windowRoundedCornerRadiusCSS();
>     if (!windowColor.isEmpty() || !windowCornerRadius.isEmpty()) {
>-        captionsOverrideStyleSheet.appendLiteral(" video::");
>+        captionsOverrideStyleSheet.appendLiteral(" ::");
>         captionsOverrideStyleSheet.append(VTTCue::cueBackdropShadowPseudoId());
>         captionsOverrideStyleSheet.append('{');
>         
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 240927)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-02-04  Per Arne Vollan  <pvollan@apple.com>
>+
>+        [WebVTT] Inline WebVTT styles should start with '::cue'
>+        https://bugs.webkit.org/show_bug.cgi?id=194227
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * media/track/captions-webvtt/css-styling.vtt:
>+
> 2019-02-04  Frederic Wang  <fwang@igalia.com>
> 
>         [css-scroll-snap] scroll-snap-align not honored on child with non-visible overflow
>Index: LayoutTests/media/track/captions-webvtt/css-styling.vtt
>===================================================================
>--- LayoutTests/media/track/captions-webvtt/css-styling.vtt	(revision 240927)
>+++ LayoutTests/media/track/captions-webvtt/css-styling.vtt	(working copy)
>@@ -12,11 +12,23 @@ font-size: 15px;
> }
> 
> STYLE
>-video::cue {
>+::cue {
> color: green;
> font-size: 15px;
> }
> 
>+STYLE
>+::cue {
>+color: blue
>+font-size: 25px;
>+}
>+
>+STYLE
>+video::cue {
>+color: blue;
>+font-size: 25px;
>+}
>+
> hello
> 00:00:00.000 --> 00:00:10.000
> <b>Hello</b> first cue.

Actions: View | Formatted Diff | Diff

Attachments on bug 194227: 361081 | 361083 | 361514 | 361516 | 361956 | 361959 | 362030 | 362045 | 362069 | 362120