REGRESSION: fast/history/visited-link-caret-color.html is a consisten…

…t image failure https://bugs.webkit.org/show_bug.cgi?id=259469 rdar://111077813 Reviewed by Megan Gardner and Aditya Keerthi. When the caret doesn't need to use the system accent color, it should just get the color the normal way, which already both accounts for the visited-ness and any color filter. * LayoutTests/fast/history/visited-link-caret-color-expected.html: * LayoutTests/fast/history/visited-link-caret-color.html: * Source/WebCore/editing/FrameSelection.cpp: (WebCore::CaretBase::computeCaretColor): Canonical link: https://commits.webkit.org/266295@main
WebKit · Jul 25, 2023 · eb3e815 · eb3e815
1 parent d9c2f80
commit eb3e815
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/LayoutTests/fast/history/visited-link-caret-color-expected.html b/LayoutTests/fast/history/visited-link-caret-color-expected.html
@@ -5,12 +5,14 @@
 #test-container {
     height: 50px;
     width: 50px;
-    overflow: hidden;
 }
 
 #mock-caret {
-    height: inherit;
-    width: inherit;
+    width: 50px;
+    height: 100px;
+    position: absolute;
+    top: 100px;
+    left: 8px;
     background-color: green;
 }
 </style>

diff --git a/LayoutTests/fast/history/visited-link-caret-color.html b/LayoutTests/fast/history/visited-link-caret-color.html
@@ -3,8 +3,8 @@
 <head>
 <style>
 #test-container {
-    height: 50px;
-    width: 50px;
+    height: 150px;
+    width: 100px;
     overflow: hidden;
     outline: none;
 }
@@ -15,6 +15,7 @@
     width: inherit;
     transform-origin: left top;
     transform: scale(50, 50);
+    clip-path: inset(1px 99px 0px 0px);
     font-size: 10px; /* Needed for the caret to render in Firefox. */
 }
 

diff --git a/Source/WebCore/editing/FrameSelection.cpp b/Source/WebCore/editing/FrameSelection.cpp
@@ -1918,7 +1918,7 @@ Color CaretBase::computeCaretColor(const RenderStyle& elementStyle, const Node*
         return elementStyle.colorByApplyingColorFilter(systemAccentColor);
     }
 
-    return elementStyle.colorByApplyingColorFilter(elementStyle.colorResolvingCurrentColor(elementStyle.caretColor()));
+    return elementStyle.visitedDependentColorWithColorFilter(CSSPropertyCaretColor);
 #else
     RefPtr parentElement = node ? node->parentElement() : nullptr;
     auto* parentStyle = parentElement && parentElement->renderer() ? &parentElement->renderer()->style() : nullptr;