Title: [231124] trunk
Revision
231124
Author
simon.fra...@apple.com
Date
2018-04-27 17:27:32 -0700 (Fri, 27 Apr 2018)

Log Message

Implement color-filter for text stroke
https://bugs.webkit.org/show_bug.cgi?id=185098

Reviewed by Alan Bujtas.
Source/WebCore:

Transform the text stroke color through color-filter.

Test: css3/color-filters/color-filter-text-stroke.html

* rendering/TextPaintStyle.cpp:
(WebCore::computeTextPaintStyle):

LayoutTests:

* css3/color-filters/color-filter-text-stroke-expected.html: Added.
* css3/color-filters/color-filter-text-stroke.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (231123 => 231124)


--- trunk/LayoutTests/ChangeLog	2018-04-28 00:27:29 UTC (rev 231123)
+++ trunk/LayoutTests/ChangeLog	2018-04-28 00:27:32 UTC (rev 231124)
@@ -1,5 +1,15 @@
 2018-04-27  Simon Fraser  <simon.fra...@apple.com>
 
+        Implement color-filter for text stroke
+        https://bugs.webkit.org/show_bug.cgi?id=185098
+
+        Reviewed by Alan Bujtas.
+
+        * css3/color-filters/color-filter-text-stroke-expected.html: Added.
+        * css3/color-filters/color-filter-text-stroke.html: Added.
+
+2018-04-27  Simon Fraser  <simon.fra...@apple.com>
+
         Implement animation for color-filter
         https://bugs.webkit.org/show_bug.cgi?id=185092
         rdar://problem/39773810

Added: trunk/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html (0 => 231124)


--- trunk/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html	                        (rev 0)
+++ trunk/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html	2018-04-28 00:27:32 UTC (rev 231124)
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: color-filter reference</title>
+        <link rel="author" title="Apple" href=""
+        <style type="text/css">
+            .test
+            {
+                margin: 50px 20px;
+                font: 120px Ahem;
+                color: green;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="test" style="stroke-color: blue; stroke-width: 20px;">O</div>
+        <div class="test" style="-webkit-text-stroke: 20px blue;">O</div>
+    </body>
+</html>

Added: trunk/LayoutTests/css3/color-filters/color-filter-text-stroke.html (0 => 231124)


--- trunk/LayoutTests/css3/color-filters/color-filter-text-stroke.html	                        (rev 0)
+++ trunk/LayoutTests/css3/color-filters/color-filter-text-stroke.html	2018-04-28 00:27:32 UTC (rev 231124)
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: color-filter affects text stroke</title>
+        <link rel="author" title="Apple" href=""
+        <link rel="match" href=""
+
+        <meta name="assert" content="color-filter affects text stroke">
+        <style type="text/css">
+            .test
+            {
+                margin: 50px 20px;
+                font: 120px Ahem;
+                color: rgb(255, 128, 255);
+                color-filter: invert();
+            }
+        </style>
+        <script>
+            if (window.internals)
+                internals.settings.setColorFilterEnabled(true);
+        </script>
+    </head>
+    <body>
+        <div class="test" style="stroke-color: yellow; stroke-width: 20px;">O</div>
+        <div class="test" style="-webkit-text-stroke: 20px yellow;">O</div>
+    </body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (231123 => 231124)


--- trunk/Source/WebCore/ChangeLog	2018-04-28 00:27:29 UTC (rev 231123)
+++ trunk/Source/WebCore/ChangeLog	2018-04-28 00:27:32 UTC (rev 231124)
@@ -1,5 +1,19 @@
 2018-04-27  Simon Fraser  <simon.fra...@apple.com>
 
+        Implement color-filter for text stroke
+        https://bugs.webkit.org/show_bug.cgi?id=185098
+
+        Reviewed by Alan Bujtas.
+        
+        Transform the text stroke color through color-filter.
+
+        Test: css3/color-filters/color-filter-text-stroke.html
+
+        * rendering/TextPaintStyle.cpp:
+        (WebCore::computeTextPaintStyle):
+
+2018-04-27  Simon Fraser  <simon.fra...@apple.com>
+
         Implement animation for color-filter
         https://bugs.webkit.org/show_bug.cgi?id=185092
         rdar://problem/39773810

Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (231123 => 231124)


--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp	2018-04-28 00:27:29 UTC (rev 231123)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp	2018-04-28 00:27:32 UTC (rev 231124)
@@ -120,7 +120,7 @@
     if (forceBackgroundToWhite)
         paintStyle.fillColor = adjustColorForVisibilityOnBackground(paintStyle.fillColor, Color::white);
 
-    paintStyle.strokeColor = lineStyle.computedStrokeColor();
+    paintStyle.strokeColor = lineStyle.colorByApplyingColorFilter(lineStyle.computedStrokeColor());
 
     // Make the text stroke color legible against a white background
     if (forceBackgroundToWhite)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to