Title: [233329] trunk
Revision
233329
Author
[email protected]
Date
2018-06-28 14:48:45 -0700 (Thu, 28 Jun 2018)

Log Message

Find on page selection color isn't adapted for dark mode.
https://bugs.webkit.org/show_bug.cgi?id=187072
Source/WebCore:

Unreviewed, revert part of r233280.


* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Use pure yellow again.

LayoutTests:

rdar://problem/40354841

Unreviewed test gardening.


* fast/css/apple-system-control-colors-expected.txt: Use pure yellow for find.
* fast/text/mark-matches-broken-line-rendering-expected.html:
* fast/text/mark-matches-rendering-expected.html:
Use -apple-system-find-highlight-background to work on all macOS versions.
* platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt: Use pure yellow for find.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (233328 => 233329)


--- trunk/LayoutTests/ChangeLog	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/LayoutTests/ChangeLog	2018-06-28 21:48:45 UTC (rev 233329)
@@ -1,3 +1,17 @@
+2018-06-28  Timothy Hatcher  <[email protected]>
+
+        Find on page selection color isn't adapted for dark mode.
+        https://bugs.webkit.org/show_bug.cgi?id=187072
+        rdar://problem/40354841
+
+        Unreviewed test gardening.
+
+        * fast/css/apple-system-control-colors-expected.txt: Use pure yellow for find.
+        * fast/text/mark-matches-broken-line-rendering-expected.html:
+        * fast/text/mark-matches-rendering-expected.html:
+        Use -apple-system-find-highlight-background to work on all macOS versions.
+        * platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt: Use pure yellow for find.
+
 2018-06-28  Antoine Quint  <[email protected]>
 
         [Web Animations] Make imported/mozilla/css-animations/test_animation-starttime.html pass reliably

Modified: trunk/LayoutTests/fast/css/apple-system-control-colors-expected.txt (233328 => 233329)


--- trunk/LayoutTests/fast/css/apple-system-control-colors-expected.txt	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/LayoutTests/fast/css/apple-system-control-colors-expected.txt	2018-06-28 21:48:45 UTC (rev 233329)
@@ -12,7 +12,7 @@
 -apple-system-selected-text-background : rgb(181, 213, 255)
 -apple-system-unemphasized-selected-text-background : rgb(212, 212, 212)
 -apple-system-placeholder-text : rgba(0, 0, 0, 0.247059)
--apple-system-find-highlight-background : rgb(255, 204, 0)
+-apple-system-find-highlight-background : rgb(255, 255, 0)
 -apple-system-label : rgba(0, 0, 0, 0.85098)
 -apple-system-secondary-label : rgba(0, 0, 0, 0.498039)
 -apple-system-tertiary-label : rgba(0, 0, 0, 0.247059)

Modified: trunk/LayoutTests/fast/text/mark-matches-broken-line-rendering-expected.html (233328 => 233329)


--- trunk/LayoutTests/fast/text/mark-matches-broken-line-rendering-expected.html	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/LayoutTests/fast/text/mark-matches-broken-line-rendering-expected.html	2018-06-28 21:48:45 UTC (rev 233329)
@@ -6,7 +6,7 @@
 }
 
 span {
-    background-color: rgb(255, 204, 0);
+    background-color: -apple-system-find-highlight-background;
     color: -apple-system-label;
 }
 </style>

Modified: trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html (233328 => 233329)


--- trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html	2018-06-28 21:48:45 UTC (rev 233329)
@@ -1,3 +1,3 @@
-<p style="display: inline-block; background-color: rgb(255, 204, 0); color: -apple-system-label">
+<p style="display: inline-block; background-color: -apple-system-find-highlight-background; color: -apple-system-label">
 Quo usque tandem abutere, Catilina, patientia nostra?
 </p>

Modified: trunk/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt (233328 => 233329)


--- trunk/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt	2018-06-28 21:48:45 UTC (rev 233329)
@@ -12,7 +12,7 @@
 -apple-system-selected-text-background : rgb(181, 213, 255)
 -apple-system-unemphasized-selected-text-background : rgb(212, 212, 212)
 -apple-system-placeholder-text : rgba(0, 0, 0, 0.247059)
--apple-system-find-highlight-background : rgb(255, 204, 0)
+-apple-system-find-highlight-background : rgb(255, 255, 0)
 -apple-system-label : rgba(0, 0, 0, 0.85098)
 -apple-system-secondary-label : rgba(0, 0, 0, 0.498039)
 -apple-system-tertiary-label : rgba(0, 0, 0, 0.247059)

Modified: trunk/Source/WebCore/ChangeLog (233328 => 233329)


--- trunk/Source/WebCore/ChangeLog	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/Source/WebCore/ChangeLog	2018-06-28 21:48:45 UTC (rev 233329)
@@ -1,3 +1,13 @@
+2018-06-28  Timothy Hatcher  <[email protected]>
+
+        Find on page selection color isn't adapted for dark mode.
+        https://bugs.webkit.org/show_bug.cgi?id=187072
+
+        Unreviewed, revert part of r233280.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Use pure yellow again.
+
 2018-06-28  Antoine Quint  <[email protected]>
 
         [Web Animations] Make imported/mozilla/css-animations/test_animation-starttime.html pass reliably

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (233328 => 233329)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2018-06-28 21:23:33 UTC (rev 233328)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2018-06-28 21:48:45 UTC (rev 233329)
@@ -398,7 +398,7 @@
     return colorFromNSColor([NSColor findHighlightColor]);
 #else
     UNUSED_PARAM(options);
-    return Color(255, 204, 0); // Yellow.
+    return Color(255, 255, 0); // Yellow.
 #endif
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to