Changeset 235922 in webkit

Timestamp:

Sep 11, 2018 4:41:49 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

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> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt

@@ -20 +20 @@
 -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)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -868 +868 @@
         case CSSValueAppleSystemFindHighlightBackground:
             return platformActiveTextSearchHighlightColor(options);
-
+#endif
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
         case CSSValueAppleSystemContainerBorder:
             return 0xFFC5C5C5;