Diff
Modified: branches/safari-605-branch/LayoutTests/ChangeLog (227304 => 227305)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-22 17:57:12 UTC (rev 227304)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-22 17:57:15 UTC (rev 227305)
@@ -1,5 +1,22 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227141. rdar://problem/36722585
+
+ 2018-01-17 Per Arne Vollan <pvol...@apple.com>
+
+ REGRESSION (r224780): Text stroke not applied to video captions.
+ https://bugs.webkit.org/show_bug.cgi?id=181743
+ <rdar://problem/35874338>
+
+ Reviewed by Simon Fraser.
+
+ * media/track/track-css-stroke-cues-expected.txt:
+ * media/track/track-css-stroke-cues.html:
+ * media/track/track-css-visible-stroke-expected.html: Added.
+ * media/track/track-css-visible-stroke.html: Added.
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227140. rdar://problem/36722478
2018-01-18 Andy Estes <aes...@apple.com>
Modified: branches/safari-605-branch/LayoutTests/media/track/track-css-stroke-cues-expected.txt (227304 => 227305)
--- branches/safari-605-branch/LayoutTests/media/track/track-css-stroke-cues-expected.txt 2018-01-22 17:57:12 UTC (rev 227304)
+++ branches/safari-605-branch/LayoutTests/media/track/track-css-stroke-cues-expected.txt 2018-01-22 17:57:15 UTC (rev 227305)
@@ -2,8 +2,8 @@
Test that style to all cues is applied correctly.
EVENT(canplaythrough)
EVENT(seeked)
-EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeWidth == '4px') OK
-EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeColor == 'rgb(0, 0, 0)') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeWidth == '4px') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeColor == 'rgb(0, 0, 0)') OK
EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).paintOrder == 'stroke') OK
EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinejoin == 'round') OK
EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinecap == 'round') OK
Modified: branches/safari-605-branch/LayoutTests/media/track/track-css-stroke-cues.html (227304 => 227305)
--- branches/safari-605-branch/LayoutTests/media/track/track-css-stroke-cues.html 2018-01-22 17:57:12 UTC (rev 227304)
+++ branches/safari-605-branch/LayoutTests/media/track/track-css-stroke-cues.html 2018-01-22 17:57:15 UTC (rev 227305)
@@ -9,7 +9,7 @@
<style>
- video::cue { -webkit-text-stroke: 4px black; paint-order: stroke; stroke-linecap: round; stroke-linejoin: round;}
+ video::cue { stroke-width: 4px; stroke-color: black; paint-order: stroke; stroke-linecap: round; stroke-linejoin: round;}
</style>
@@ -17,8 +17,8 @@
function seeked()
{
- testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeWidth", "4px");
- testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeColor", "rgb(0, 0, 0)");
+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeWidth", "4px");
+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeColor", "rgb(0, 0, 0)");
testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).paintOrder", "stroke");
testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinejoin", "round");
testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinecap", "round");
Added: branches/safari-605-branch/LayoutTests/media/track/track-css-visible-stroke-expected.html (0 => 227305)
--- branches/safari-605-branch/LayoutTests/media/track/track-css-visible-stroke-expected.html (rev 0)
+++ branches/safari-605-branch/LayoutTests/media/track/track-css-visible-stroke-expected.html 2018-01-22 17:57:15 UTC (rev 227305)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <style>
+
+ .redtile {
+ width: 50px;
+ height: 50px;
+ position: absolute;
+ background-color: red;
+ }
+
+ </style>
+
+ </head>
+ <body>
+ <div class="redtile" style="left: 0px; top: 0px;"></div>
+ </body>
+</html>
Added: branches/safari-605-branch/LayoutTests/media/track/track-css-visible-stroke.html (0 => 227305)
--- branches/safari-605-branch/LayoutTests/media/track/track-css-visible-stroke.html (rev 0)
+++ branches/safari-605-branch/LayoutTests/media/track/track-css-visible-stroke.html 2018-01-22 17:57:15 UTC (rev 227305)
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script>var requirePixelDump = true;</script>
+ <script src=""
+ <script src=""
+ <script src=""
+
+ <style>
+ video::cue { font-size: 400px; stroke-width: 400px; stroke-color: red; paint-order: fill;}
+
+ .obscurer {
+ width: 500px;
+ height: 500px;
+ position: absolute;
+ background-color: white;
+ }
+ </style>
+ <script>
+ function seeked()
+ {
+ endTest();
+ }
+
+ function loaded()
+ {
+ consoleWrite("Test that text stroke is applied correctly.");
+ findMediaElement();
+ video.src = "" '../content/test');
+ waitForEvent('seeked', seeked);
+ waitForEvent('canplaythrough', function() { video.currentTime = .5; });
+ }
+
+ setCaptionDisplayMode('Automatic');
+ </script>
+ </head>
+ <body _onload_="loaded()">
+ <video style="position: absolute; left: 0px; top: 0px;" controls >
+ <track src="" kind="captions" default>
+ </video>
+ <div class="obscurer" style="left: 0px; top: 50px;"></div>
+ <div class="obscurer" style="left: 50px; top: 0px;"></div>
+ </body>
+</html>
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (227304 => 227305)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-22 17:57:12 UTC (rev 227304)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-22 17:57:15 UTC (rev 227305)
@@ -1,5 +1,28 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227141. rdar://problem/36722585
+
+ 2018-01-17 Per Arne Vollan <pvol...@apple.com>
+
+ REGRESSION (r224780): Text stroke not applied to video captions.
+ https://bugs.webkit.org/show_bug.cgi?id=181743
+ <rdar://problem/35874338>
+
+ Reviewed by Simon Fraser.
+
+ Tests: media/track/track-css-visible-stroke-expected.html
+ media/track/track-css-visible-stroke.html
+
+ After r224780, it is no longer possible to mix text stroke styles with webkit
+ legacy text stroke styles.
+
+ * css/StyleResolver.cpp:
+ (WebCore::isValidCueStyleProperty):
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS const):
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227140. rdar://problem/36722478
2018-01-18 Andy Estes <aes...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/css/StyleResolver.cpp (227304 => 227305)
--- branches/safari-605-branch/Source/WebCore/css/StyleResolver.cpp 2018-01-22 17:57:12 UTC (rev 227304)
+++ branches/safari-605-branch/Source/WebCore/css/StyleResolver.cpp 2018-01-22 17:57:15 UTC (rev 227305)
@@ -1529,8 +1529,8 @@
case CSSPropertyPaintOrder:
case CSSPropertyStrokeLinejoin:
case CSSPropertyStrokeLinecap:
- case CSSPropertyWebkitTextStrokeColor:
- case CSSPropertyWebkitTextStrokeWidth:
+ case CSSPropertyStrokeColor:
+ case CSSPropertyStrokeWidth:
return true;
default:
break;
Modified: branches/safari-605-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (227304 => 227305)
--- branches/safari-605-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2018-01-22 17:57:12 UTC (rev 227304)
+++ branches/safari-605-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2018-01-22 17:57:15 UTC (rev 227305)
@@ -395,7 +395,7 @@
appendCSS(builder, CSSPropertyTextShadow, makeString(edgeStyleDropShadow.get(), " black"), important);
if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDropShadow || textEdgeStyle == kMACaptionAppearanceTextEdgeStyleUniform) {
- appendCSS(builder, CSSPropertyWebkitTextStrokeColor, "black", important);
+ appendCSS(builder, CSSPropertyStrokeColor, "black", important);
appendCSS(builder, CSSPropertyPaintOrder, getValueName(CSSValueStroke), important);
appendCSS(builder, CSSPropertyStrokeLinejoin, getValueName(CSSValueRound), important);
appendCSS(builder, CSSPropertyStrokeLinecap, getValueName(CSSValueRound), important);
