Title: [214796] releases/WebKitGTK/webkit-2.16
Revision
214796
Author
carlo...@webkit.org
Date
2017-04-03 08:58:46 -0700 (Mon, 03 Apr 2017)

Log Message

Merge r214340 - Text stroke is sometimes clipped on video captions.
https://bugs.webkit.org/show_bug.cgi?id=170006

Reviewed by Eric Carlson.

Source/WebCore:

Set 'overflow' property to 'visible' on cue element to avoid clipping of text stroke.

Updated test media/track/track-css-stroke-cues.html.

* html/track/TextTrackCueGeneric.cpp:
(WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
* html/track/VTTCue.cpp:
(WebCore::VTTCueBox::applyCSSProperties):

LayoutTests:

* media/track/track-css-stroke-cues-expected.txt:
* media/track/track-css-stroke-cues.html:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (214795 => 214796)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog	2017-04-03 15:56:17 UTC (rev 214795)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog	2017-04-03 15:58:46 UTC (rev 214796)
@@ -1,3 +1,13 @@
+2017-03-24  Per Arne Vollan  <pvol...@apple.com>
+
+        Text stroke is sometimes clipped on video captions.
+        https://bugs.webkit.org/show_bug.cgi?id=170006
+
+        Reviewed by Eric Carlson.
+
+        * media/track/track-css-stroke-cues-expected.txt:
+        * media/track/track-css-stroke-cues.html:
+
 2017-03-23  Brady Eidson  <beid...@apple.com>
 
         WebSQL databases should not openable in private browsing.

Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/media/track/track-css-stroke-cues-expected.txt (214795 => 214796)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/media/track/track-css-stroke-cues-expected.txt	2017-04-03 15:56:17 UTC (rev 214795)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/media/track/track-css-stroke-cues-expected.txt	2017-04-03 15:58:46 UTC (rev 214796)
@@ -7,5 +7,6 @@
 EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).paintOrder == 'stroke') OK
 EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinejoin == 'round') OK
 EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinecap == 'round') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).overflow == 'visible') OK
 END OF TEST
 

Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/media/track/track-css-stroke-cues.html (214795 => 214796)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/media/track/track-css-stroke-cues.html	2017-04-03 15:56:17 UTC (rev 214795)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/media/track/track-css-stroke-cues.html	2017-04-03 15:58:46 UTC (rev 214796)
@@ -22,6 +22,7 @@
             testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).paintOrder", "stroke");
             testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinejoin", "round");
             testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinecap", "round");
+            testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).overflow", "visible");
             endTest();
         }
 

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214795 => 214796)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-04-03 15:56:17 UTC (rev 214795)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-04-03 15:58:46 UTC (rev 214796)
@@ -1,3 +1,19 @@
+2017-03-24  Per Arne Vollan  <pvol...@apple.com>
+
+        Text stroke is sometimes clipped on video captions.
+        https://bugs.webkit.org/show_bug.cgi?id=170006
+
+        Reviewed by Eric Carlson.
+
+        Set 'overflow' property to 'visible' on cue element to avoid clipping of text stroke.
+
+        Updated test media/track/track-css-stroke-cues.html.
+
+        * html/track/TextTrackCueGeneric.cpp:
+        (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+        * html/track/VTTCue.cpp:
+        (WebCore::VTTCueBox::applyCSSProperties):
+
 2017-03-23  Brady Eidson  <beid...@apple.com>
 
         WebSQL databases should not openable in private browsing.

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/html/track/TextTrackCueGeneric.cpp (214795 => 214796)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/html/track/TextTrackCueGeneric.cpp	2017-04-03 15:56:17 UTC (rev 214795)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/html/track/TextTrackCueGeneric.cpp	2017-04-03 15:58:46 UTC (rev 214796)
@@ -141,6 +141,10 @@
         setInlineStyleProperty(CSSPropertyBackgroundColor, cue->backgroundColor().serialized());
     setInlineStyleProperty(CSSPropertyWritingMode, cue->getCSSWritingMode(), false);
     setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePreWrap);
+
+    // Make sure shadow or stroke is not clipped.
+    setInlineStyleProperty(CSSPropertyOverflow, CSSValueVisible);
+    cueElement->setInlineStyleProperty(CSSPropertyOverflow, CSSValueVisible);
 }
 
 TextTrackCueGeneric::TextTrackCueGeneric(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, const String& content)

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/html/track/VTTCue.cpp (214795 => 214796)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/html/track/VTTCue.cpp	2017-04-03 15:56:17 UTC (rev 214795)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/html/track/VTTCue.cpp	2017-04-03 15:58:46 UTC (rev 214796)
@@ -223,6 +223,10 @@
 
         setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePre);
     }
+
+    // Make sure shadow or stroke is not clipped.
+    setInlineStyleProperty(CSSPropertyOverflow, CSSValueVisible);
+    m_cue.element().setInlineStyleProperty(CSSPropertyOverflow, CSSValueVisible);
 }
 
 const AtomicString& VTTCueBox::vttCueBoxShadowPseudoId()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to