Title: [229880] trunk
Revision
229880
Author
[email protected]
Date
2018-03-22 21:04:57 -0700 (Thu, 22 Mar 2018)

Log Message

Expose more system colors via CSS
https://bugs.webkit.org/show_bug.cgi?id=183764
<rdar://problem/36975898>

Reviewed by Tim Horton.

Test: fast/css/apple-system-control-colors.html

Expose Apple specific system colors via CSS.

* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::systemColor const):

Modified Paths

Added Paths

Diff

Added: trunk/LayoutTests/fast/css/apple-system-control-colors-expected.txt (0 => 229880)


--- trunk/LayoutTests/fast/css/apple-system-control-colors-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/css/apple-system-control-colors-expected.txt	2018-03-23 04:04:57 UTC (rev 229880)
@@ -0,0 +1,9 @@
+-apple-system-header-text : rgb(0, 0, 0)
+-apple-system-text-background : rgb(255, 255, 255)
+-apple-system-alternate-selected-text : rgb(255, 255, 255)
+-apple-system-label : rgb(0, 0, 0)
+-apple-system-secondary-label : rgb(0, 0, 0)
+-apple-system-tertiary-label : rgb(0, 0, 0)
+-apple-system-quaternary-label : rgb(0, 0, 0)
+-apple-system-grid : rgb(204, 204, 204)
+current-color with inherited -apple-system-label : rgb(0, 0, 0)

Added: trunk/LayoutTests/fast/css/apple-system-control-colors.html (0 => 229880)


--- trunk/LayoutTests/fast/css/apple-system-control-colors.html	                        (rev 0)
+++ trunk/LayoutTests/fast/css/apple-system-control-colors.html	2018-03-23 04:04:57 UTC (rev 229880)
@@ -0,0 +1,32 @@
+<script>
+    
+    if (window.testRunner)
+        window.testRunner.dumpAsText();
+    
+    window.addEventListener("load", run, false);
+    
+    function run() {
+        var divs = document.querySelectorAll("div");
+        for (var i = 0; i < divs.length; i++) {
+            var div = divs[i];
+            var span = div.querySelector("span");
+            div.innerHTML += " : " + window.getComputedStyle(span).backgroundColor;
+        }
+    }
+</script>
+<style>
+    .swatch {
+        display: inline-block;
+        width: 40px;
+        height: 40px;
+    }
+</style>
+<div><span class="swatch" style="background-color: -apple-system-header-text"></span>-apple-system-header-text</div>
+<div><span class="swatch" style="background-color: -apple-system-text-background"></span>-apple-system-text-background</div>
+<div><span class="swatch" style="background-color: -apple-system-alternate-selected-text"></span>-apple-system-alternate-selected-text</div>
+<div><span class="swatch" style="background-color: -apple-system-label"></span>-apple-system-label</div>
+<div><span class="swatch" style="background-color: -apple-system-secondary-label"></span>-apple-system-secondary-label</div>
+<div><span class="swatch" style="background-color: -apple-system-tertiary-label"></span>-apple-system-tertiary-label</div>
+<div><span class="swatch" style="background-color: -apple-system-quaternary-label"></span>-apple-system-quaternary-label</div>
+<div><span class="swatch" style="background-color: -apple-system-grid"></span>-apple-system-grid</div>
+<div style="color: -apple-system-label"><span class="swatch" style="background-color: currentcolor;"></span>current-color with inherited -apple-system-label</div>

Modified: trunk/Source/WebCore/ChangeLog (229879 => 229880)


--- trunk/Source/WebCore/ChangeLog	2018-03-23 01:41:44 UTC (rev 229879)
+++ trunk/Source/WebCore/ChangeLog	2018-03-23 04:04:57 UTC (rev 229880)
@@ -1,3 +1,18 @@
+2018-03-22  Megan Gardner  <[email protected]>
+
+        Expose more system colors via CSS
+        https://bugs.webkit.org/show_bug.cgi?id=183764
+        <rdar://problem/36975898>
+
+        Reviewed by Tim Horton.
+
+        Test: fast/css/apple-system-control-colors.html
+
+        Expose Apple specific system colors via CSS.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemColor const):
+
 2018-03-22  Nan Wang  <[email protected]>
 
         AX: Web table row count is incorrect when role row is added to <tr> in DOM

Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (229879 => 229880)


--- trunk/Source/WebCore/css/CSSValueKeywords.in	2018-03-23 01:41:44 UTC (rev 229879)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in	2018-03-23 04:04:57 UTC (rev 229880)
@@ -222,6 +222,14 @@
 window
 windowframe
 windowtext
+-apple-system-header-text
+-apple-system-text-background
+-apple-system-alternate-selected-text
+-apple-system-label
+-apple-system-secondary-label
+-apple-system-tertiary-label
+-apple-system-quaternary-label
+-apple-system-grid
 -apple-wireless-playback-target-active
 -apple-system-blue
 -apple-system-brown

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (229879 => 229880)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2018-03-23 01:41:44 UTC (rev 229879)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2018-03-23 04:04:57 UTC (rev 229880)
@@ -550,6 +550,22 @@
                 return @selector(windowFrameColor);
             case CSSValueWindowtext:
                 return @selector(windowFrameTextColor);
+            case CSSValueAppleSystemHeaderText:
+                return @selector(headerTextColor);
+            case CSSValueAppleSystemTextBackground:
+                return @selector(textBackgroundColor);
+            case CSSValueAppleSystemAlternateSelectedText:
+                return @selector(alternateSelectedControlTextColor);
+            case CSSValueAppleSystemLabel:
+                return @selector(labelColor);
+            case CSSValueAppleSystemSecondaryLabel:
+                return @selector(secondaryLabelColor);
+            case CSSValueAppleSystemTertiaryLabel:
+                return @selector(tertiaryLabelColor);
+            case CSSValueAppleSystemQuaternaryLabel:
+                return @selector(quaternaryLabelColor);
+            case CSSValueAppleSystemGrid:
+                return @selector(gridColor);
             case CSSValueAppleWirelessPlaybackTargetActive:
                 return @selector(systemBlueColor);
             case CSSValueAppleSystemBlue:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to