Follow up to:

Expose -apple-system-container-border color to internal web views.
https://bugs.webkit.org/show_bug.cgi?id=189178.

Patch by James Savage <james.savage@apple.com> on 2018-09-11
Reviewed by Timothy Hatcher.

Source/WebCore:

* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::systemColor const): Add a separate #if block for
Mojave. When I used CSSValueAppleSystemFindHighlightBackground as a template
for this change, I had to write out the condition in the first change, but
mistakenly thought I could reuse the block here. Turns out the versions were
different, and I could not.

LayoutTests:

* platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt:
Reset test expectations to go along with fix.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b02d39d..833326b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2018-09-11  James Savage  <james.savage@apple.com>
+
+        Follow up to:
+        Expose -apple-system-container-border color to internal web views.
+        https://bugs.webkit.org/show_bug.cgi?id=189178.
+
+        Reviewed by Timothy Hatcher.
+
+        * platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt:
+        Reset test expectations to go along with fix.
+
 2018-09-07  Dean Jackson  <dino@apple.com>
 
         Add and expose Internal features from WebKit

diff --git a/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt b/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt
index 0c8bd9e..8d65ee0 100644 (file)
--- a/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt
+++ b/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt
@@ -19,5 +19,5 @@
 -apple-system-quaternary-label : rgba(0, 0, 0, 0.0980392)
 -apple-system-grid : rgb(204, 204, 204)
 -apple-system-separator : rgb(204, 204, 204)
--apple-system-container-border : rgba(0, 0, 0, 0)
+-apple-system-container-border : rgb(197, 197, 197)
 current-color with inherited -apple-system-label : rgba(0, 0, 0, 0.85098)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cc95653..51e47e6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2018-09-11  James Savage  <james.savage@apple.com>
+
+        Follow up to:
+        Expose -apple-system-container-border color to internal web views.
+        https://bugs.webkit.org/show_bug.cgi?id=189178.
+
+        Reviewed by Timothy Hatcher.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemColor const): Add a separate #if block for
+        Mojave. When I used CSSValueAppleSystemFindHighlightBackground as a template
+        for this change, I had to write out the condition in the first change, but
+        mistakenly thought I could reuse the block here. Turns out the versions were
+        different, and I could not.
+
 2018-09-11  Youenn Fablet  <youenn@apple.com>
 
         Remove MediaDevices NoInterfaceObject

diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
index 4fea87d..91cd6de 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeMac.mm
+++ b/Source/WebCore/rendering/RenderThemeMac.mm
@@ -867,7 +867,9 @@ Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O
 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
         case CSSValueAppleSystemFindHighlightBackground:
             return platformActiveTextSearchHighlightColor(options);
+#endif
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
         case CSSValueAppleSystemContainerBorder:
             return 0xFFC5C5C5;
 #endif