Attachment 349232 Details for Bug 189178 – Patch

[patch] Patch

bug-189178-20180907193730.patch (text/plain), 8.45 KB, created by James Savage on 2018-09-07 19:37:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Savage

Created: 2018-09-07 19:37:31 PDT

Size: 8.45 KB

patch

obsolete

>Subversion Revision: 235722
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 79bb5925029d404addd1c46bcfc010b480b78307..caf289e3c089de0fd7ec8b8d199f8746b647ffd5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-30  James Savage  <james.savage@apple.com>
>+
>+        Expose -apple-system-container-border color to internal web views.
>+        https://bugs.webkit.org/show_bug.cgi?id=189178.
>+
>+        Reviewed by Timothy Hatcher.
>+
>+        Tests: LayoutTests/fast/css/apple-system-colors.html
>+
>+        * css/CSSValueKeywords.in: Add new semantic color name.
>+        * rendering/RenderThemeMac.mm:
>+        (WebCore::RenderThemeMac::systemColor const): Use system color on supported
>+        systems, and fall back to approximation for older systems.
>+
> 2018-09-05  Youenn Fablet  <youenn@apple.com>
> 
>         Move ownership of outgoing source to RTCRtpSender backend
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 4012e5eb4c3729de15db30ea93c0dca3dd2bd6a4..744dc31e76399a79b39829ff37fd0ccc4fb35bbc 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-08-30  James Savage  <james.savage@apple.com>
>+
>+        Expose -apple-system-container-border color to internal web views.
>+        https://bugs.webkit.org/show_bug.cgi?id=189178.
>+
>+        Reviewed by Timothy Hatcher.
>+
>+        * pal/spi/cocoa/NSColorSPI.h: Declare SPI.
>+
> 2018-09-04  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, attempt to fix an internal build after r235585.
>diff --git a/Source/WebCore/PAL/pal/spi/cocoa/NSColorSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSColorSPI.h
>index 81616522bb248a4443b0f3e2f48edc583ddd3864..44f7ebd4bc002726cb470c42b9cc6c792c71cd87 100644
>--- a/Source/WebCore/PAL/pal/spi/cocoa/NSColorSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cocoa/NSColorSPI.h
>@@ -48,6 +48,7 @@
> + (NSColor *)linkColor;
> + (NSColor *)findHighlightColor;
> + (NSColor *)placeholderTextColor;
>++ (NSColor *)containerBorderColor;
> @end
> 
> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in
>index 74c450d09f652f64d783e55c0c4a4bcfa2d2bbf1..8cdc29b5186834e420ad52e8db6353b51994f84e 100644
>--- a/Source/WebCore/css/CSSValueKeywords.in
>+++ b/Source/WebCore/css/CSSValueKeywords.in
>@@ -244,6 +244,7 @@ windowtext
> -apple-system-quaternary-label
> -apple-system-grid
> -apple-system-separator
>+-apple-system-container-border
> #endif
> -apple-wireless-playback-target-active
> -apple-system-blue
>diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
>index c7375fa018e00cf9f862f1441db6913ad72322fb..4fea87d85a8384743ac4be775a8504ceaa168df7 100644
>--- a/Source/WebCore/rendering/RenderThemeMac.mm
>+++ b/Source/WebCore/rendering/RenderThemeMac.mm
>@@ -767,6 +767,13 @@ Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O
> #else
>                 // Handled below.
>                 return nullptr;
>+#endif
>+            case CSSValueAppleSystemContainerBorder:
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+                return @selector(containerBorderColor);
>+#else
>+                // Handled below.
>+                return nullptr;
> #endif
>             case CSSValueAppleSystemLabel:
>                 return @selector(labelColor);
>@@ -860,6 +867,9 @@ Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O
> #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
>         case CSSValueAppleSystemFindHighlightBackground:
>             return platformActiveTextSearchHighlightColor(options);
>+
>+        case CSSValueAppleSystemContainerBorder:
>+            return 0xFFC5C5C5;
> #endif
> 
>         case CSSValueAppleSystemEvenAlternatingContentBackground: {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 5d50e7c90c8d75908b5345dbabb0b679131b3563..17782c6cbe4cc6d0400d8206834d08da62d0c434 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-30  James Savage  <james.savage@apple.com>
>+
>+        Expose -apple-system-container-border color to internal web views.
>+        https://bugs.webkit.org/show_bug.cgi?id=189178.
>+
>+        Reviewed by Timothy Hatcher.
>+
>+        * fast/css/apple-system-control-colors-expected.txt:
>+        * fast/css/apple-system-control-colors.html:
>+        * platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt:
>+        * platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt:
>+        * platform/mac/fast/css/apple-system-control-colors-expected.txt:
>+
> 2018-09-05  Brent Fulgham  <bfulgham@apple.com>
> 
>         The width of a nullptr TextRun should be zero
>diff --git a/LayoutTests/fast/css/apple-system-control-colors-expected.txt b/LayoutTests/fast/css/apple-system-control-colors-expected.txt
>index 427a7a809fa452268b1edfa1731d9039eeca4e7a..025c02eeec0c50fca65d6906deee4642e01c95fe 100644
>--- a/LayoutTests/fast/css/apple-system-control-colors-expected.txt
>+++ b/LayoutTests/fast/css/apple-system-control-colors-expected.txt
>@@ -19,4 +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 : rgb(197, 197, 197)
> current-color with inherited -apple-system-label : rgba(0, 0, 0, 0.85098)
>diff --git a/LayoutTests/fast/css/apple-system-control-colors.html b/LayoutTests/fast/css/apple-system-control-colors.html
>index 842796577cabf9e98070fdd79b5652f43f9dd95e..f87d07337c35c574beb7791f22f7f2d8993b82df 100644
>--- a/LayoutTests/fast/css/apple-system-control-colors.html
>+++ b/LayoutTests/fast/css/apple-system-control-colors.html
>@@ -42,4 +42,5 @@
> <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><span class="swatch" style="background-color: -apple-system-separator"></span>-apple-system-separator</div>
>+<div><span class="swatch" style="background-color: -apple-system-container-border"></span>-apple-system-container-border</div>
> <div style="color: -apple-system-label"><span class="swatch" style="background-color: currentcolor;"></span>current-color with inherited -apple-system-label</div>
>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 8c144e3c88c78032ce30ff3ce808b371193d95b8..8d65ee0f69e2ed051b52aab282c0f4bf4a886d83 100644
>--- 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,4 +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 : rgb(197, 197, 197)
> current-color with inherited -apple-system-label : rgba(0, 0, 0, 0.85098)
>diff --git a/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt b/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt
>index 8c144e3c88c78032ce30ff3ce808b371193d95b8..8d65ee0f69e2ed051b52aab282c0f4bf4a886d83 100644
>--- a/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt
>+++ b/LayoutTests/platform/mac-sierra/fast/css/apple-system-control-colors-expected.txt
>@@ -19,4 +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 : rgb(197, 197, 197)
> current-color with inherited -apple-system-label : rgba(0, 0, 0, 0.85098)
>diff --git a/LayoutTests/platform/mac/fast/css/apple-system-control-colors-expected.txt b/LayoutTests/platform/mac/fast/css/apple-system-control-colors-expected.txt
>index f913ab66fcf0688fb887844b47a6bdf10bcd4645..087c74029bf40bbee3e1fd23372b8d0a18ee4947 100644
>--- a/LayoutTests/platform/mac/fast/css/apple-system-control-colors-expected.txt
>+++ b/LayoutTests/platform/mac/fast/css/apple-system-control-colors-expected.txt
>@@ -19,4 +19,5 @@
> -apple-system-quaternary-label : rgba(0, 0, 0, 0.0980392)
> -apple-system-grid : rgb(204, 204, 204)
> -apple-system-separator : rgba(0, 0, 0, 0.0980392)
>+-apple-system-container-border : rgba(0, 0, 0, 0.247059)
> current-color with inherited -apple-system-label : rgba(0, 0, 0, 0.847059)

Actions: View | Formatted Diff | Diff

Attachments on bug 189178: 348575 | 348578 | 348585 | 348587 | 349003 | 349007 | 349008 | 349054 | 349222 | 349228 | 349232 | 349366 | 349470