<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[231159] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/231159">231159</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2018-04-30 10:51:51 -0700 (Mon, 30 Apr 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make color-filter affect caret-color
https://bugs.webkit.org/show_bug.cgi?id=185129
rdar://problem/39829066

Reviewed by Tim Horton.
Source/WebCore:

Transform the colors used to compare the caret color with the background through
color-filter (since we want contrasting colors after filters are applied), and
transform caret-color itself.

Test: css3/color-filters/color-filter-caret-color.html

* editing/FrameSelection.cpp:
(WebCore::CaretBase::paintCaret const):

LayoutTests:

* css3/color-filters/color-filter-caret-color-expected.html: Added.
* css3/color-filters/color-filter-caret-color.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiosTestExpectations">trunk/LayoutTests/platform/ios/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3colorfilterscolorfiltercaretcolorexpectedhtml">trunk/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3colorfilterscolorfiltercaretcolorhtml">trunk/LayoutTests/css3/color-filters/color-filter-caret-color.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (231158 => 231159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-04-30 17:30:26 UTC (rev 231158)
+++ trunk/LayoutTests/ChangeLog 2018-04-30 17:51:51 UTC (rev 231159)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Make color-filter affect caret-color
+        https://bugs.webkit.org/show_bug.cgi?id=185129
+        rdar://problem/39829066
+
+        Reviewed by Tim Horton.
+
+        * css3/color-filters/color-filter-caret-color-expected.html: Added.
+        * css3/color-filters/color-filter-caret-color.html: Added.
+
</ins><span class="cx"> 2018-04-28  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix color-filter to apply to SVG colors
</span></span></pre></div>
<a id="trunkLayoutTestscss3colorfilterscolorfiltercaretcolorexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html (0 => 231159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html                              (rev 0)
+++ trunk/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html 2018-04-30 17:51:51 UTC (rev 231159)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: color-filter reference</title>
+        <link rel="author" title="Apple" href="http://www.apple.com/">
+
+        <style>
+        #test-container {
+            height: 50px;
+            width: 50px;
+            overflow: hidden;
+            border: 1px solid black;
+        }
+
+        #test {
+            background-color: white;
+            transform-origin: left top;
+            transform: scale(50, 50);
+            font-size: 10px; /* Needed for the caret to render in Firefox. */
+            caret-color: green;
+        }
+
+        </style>
+    </head>
+    <body>
+        <p>The caret should show as a green flashing square below.</p>
+        <div id="test-container">
+            <div id="test" contenteditable="true">
+                <span>&nbsp;<!-- Needed for the caret to render in Firefox. --></span>
+            </div>
+        </div>
+        <script>
+            document.getElementById("test").focus();
+            window.getSelection().modify("move", "left", "character"); // Place the caret at the start of the <span>.
+        </script>
+    </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3colorfilterscolorfiltercaretcolorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/color-filters/color-filter-caret-color.html (0 => 231159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/color-filters/color-filter-caret-color.html                               (rev 0)
+++ trunk/LayoutTests/css3/color-filters/color-filter-caret-color.html  2018-04-30 17:51:51 UTC (rev 231159)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: color-filter affects caret-color</title>
+        <link rel="author" title="Apple" href="http://www.apple.com/">
+        <link rel="match" href="color-filter-caret-color-expected.html">
+
+        <meta name="assert" content="color-filter affects caret-color">
+        <style>
+        #test-container {
+            height: 50px;
+            width: 50px;
+            overflow: hidden;
+            border: 1px solid black;
+        }
+
+        #test {
+            color-filter: invert();
+            background-color: white;
+            transform-origin: left top;
+            transform: scale(50, 50);
+            font-size: 10px; /* Needed for the caret to render in Firefox. */
+            caret-color: rgb(255, 128, 255);
+        }
+
+        </style>
+    </head>
+    <body>
+        <p>The caret should show as a green flashing square below.</p>
+        <div id="test-container">
+            <div id="test" contenteditable="true">
+                <span>&nbsp;<!-- Needed for the caret to render in Firefox. --></span>
+            </div>
+        </div>
+        <script>
+            document.getElementById("test").focus();
+            window.getSelection().modify("move", "left", "character"); // Place the caret at the start of the <span>.
+        </script>
+    </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiosTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios/TestExpectations (231158 => 231159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios/TestExpectations  2018-04-30 17:30:26 UTC (rev 231158)
+++ trunk/LayoutTests/platform/ios/TestExpectations     2018-04-30 17:51:51 UTC (rev 231159)
</span><span class="lines">@@ -1045,6 +1045,7 @@
</span><span class="cx"> fast/css/caret-color-span-inside-editable-parent.html [ Skip ]
</span><span class="cx"> fast/css/caret-color.html [ Skip ]
</span><span class="cx"> fast/history/visited-link-caret-color.html [ Skip ]
</span><ins>+css3/color-filters/color-filter-caret-color [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> # Run webrtc tests on iOS 11
</span><span class="cx"> imported/w3c/web-platform-tests/webrtc [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (231158 => 231159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-04-30 17:30:26 UTC (rev 231158)
+++ trunk/Source/WebCore/ChangeLog      2018-04-30 17:51:51 UTC (rev 231159)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Make color-filter affect caret-color
+        https://bugs.webkit.org/show_bug.cgi?id=185129
+        rdar://problem/39829066
+
+        Reviewed by Tim Horton.
+        
+        Transform the colors used to compare the caret color with the background through
+        color-filter (since we want contrasting colors after filters are applied), and
+        transform caret-color itself.
+
+        Test: css3/color-filters/color-filter-caret-color.html
+
+        * editing/FrameSelection.cpp:
+        (WebCore::CaretBase::paintCaret const):
+
</ins><span class="cx"> 2018-04-30  Michael Catanzaro  <mcatanzaro@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] Webkit should spoof as Safari on a Mac when on Chase.com
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (231158 => 231159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp  2018-04-30 17:30:26 UTC (rev 231158)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp     2018-04-30 17:51:51 UTC (rev 231159)
</span><span class="lines">@@ -1754,13 +1754,13 @@
</span><span class="cx">         auto computeCaretColor = [] (const RenderStyle& elementStyle, const RenderStyle* rootEditableStyle) {
</span><span class="cx">             // CSS value "auto" is treated as an invalid color.
</span><span class="cx">             if (!elementStyle.caretColor().isValid() && rootEditableStyle) {
</span><del>-                auto rootEditableBackgroundColor = rootEditableStyle->visitedDependentColor(CSSPropertyBackgroundColor);
-                auto elementBackgroundColor = elementStyle.visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+                auto rootEditableBackgroundColor = rootEditableStyle->visitedDependentColorWithColorFilter(CSSPropertyBackgroundColor);
+                auto elementBackgroundColor = elementStyle.visitedDependentColorWithColorFilter(CSSPropertyBackgroundColor);
</ins><span class="cx">                 auto disappearsIntoBackground = rootEditableBackgroundColor.blend(elementBackgroundColor) == rootEditableBackgroundColor;
</span><span class="cx">                 if (disappearsIntoBackground)
</span><del>-                    return rootEditableStyle->visitedDependentColor(CSSPropertyCaretColor);
</del><ins>+                    return rootEditableStyle->visitedDependentColorWithColorFilter(CSSPropertyCaretColor);
</ins><span class="cx">             }
</span><del>-            return elementStyle.visitedDependentColor(CSSPropertyCaretColor);
</del><ins>+            return elementStyle.visitedDependentColorWithColorFilter(CSSPropertyCaretColor);
</ins><span class="cx">         };
</span><span class="cx">         auto* rootEditableElement = node->rootEditableElement();
</span><span class="cx">         auto* rootEditableStyle = rootEditableElement && rootEditableElement->renderer() ? &rootEditableElement->renderer()->style() : nullptr;
</span></span></pre>
</div>
</div>

</body>
</html>