Attachment 348575 Details for Bug 189178 – Patch

[patch] Patch

bug-189178-20180830174843.patch (text/plain), 7.11 KB, created by James Savage on 2018-08-30 17:48:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Savage

Created: 2018-08-30 17:48:44 PDT

Size: 7.11 KB

patch

obsolete

>Subversion Revision: 235533
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 10b5f37c73e7166341bc1b1b4cf1672d2429fd44..6bf7261f665b430bdcf2cfde8592a060a4ff5ca8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        Tests: LayoutTests/fast/css/apple-system-colors.html
>+
>+        * css/CSSValueKeywords.in: Add new semantic color name.
>+        * rendering/RenderTheme.h: Add new cache member.
>+        * rendering/RenderThemeMac.mm:
>+        (WebCore::RenderThemeMac::systemColor const): Declare new color, with fallback to
>+        an approximation of the color for older systems.
>+
> 2018-08-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Replace AVFoundationSupport.py using CMake
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index e695f7a594990c43e0bfb56dc806670f2f6eb4bd..3f18879844de84b5ef4dcec321c80f8c451df1c8 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 NOBODY (OOPS!).
>+
>+        * pal/spi/cocoa/NSColorSPI.h: Declare SPI.
>+
> 2018-08-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Replace AVFoundationSupport.py using CMake
>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/RenderTheme.h b/Source/WebCore/rendering/RenderTheme.h
>index 5e07f40620ec64a4baa9d0cc5a176b5c9aa92a79..707b168a583e8d27e0bbccf63b1854c082e6eee8 100644
>--- a/Source/WebCore/rendering/RenderTheme.h
>+++ b/Source/WebCore/rendering/RenderTheme.h
>@@ -421,6 +421,7 @@ protected:
>         Color systemVisitedLinkColor;
>         Color systemFocusRingColor;
>         Color systemControlAccentColor;
>+        Color systemContainerBorderColor;
> 
>         Color activeSelectionBackgroundColor;
>         Color inactiveSelectionBackgroundColor;
>diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
>index c7375fa018e00cf9f862f1441db6913ad72322fb..fb28baf059a1972377567b9cc98d00ff5afaaa3c 100644
>--- a/Source/WebCore/rendering/RenderThemeMac.mm
>+++ b/Source/WebCore/rendering/RenderThemeMac.mm
>@@ -672,6 +672,13 @@ Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O
>         case CSSValueHighlight:
>             return activeSelectionBackgroundColor(options);
> 
>+        case CSSValueAppleSystemContainerBorder:
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+            return systemAppearanceColor(cache.systemContainerBorderColor, @selector(containerBorderColor));
>+#else
>+            return 0xFFC5C5C5;
>+#endif
>+
>         default:
>             // Handle other system colors below, that don't need special system appearance handling.
>             break;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 34abd263c985ae7baf5b1289fe46beb1b18c7775..3af3faf440662715fc4310a0c320d1fc0cf82a06 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 NOBODY (OOPS!).
>+
>+        This color will come through as black on standard web views.
>+
>+        * fast/css/apple-system-control-colors-expected.txt:
>+        * fast/css/apple-system-control-colors.html:
>+        * platform/mac/fast/css/apple-system-control-colors-expected.txt:
>+
> 2018-08-30  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r235516.
>diff --git a/LayoutTests/fast/css/apple-system-control-colors-expected.txt b/LayoutTests/fast/css/apple-system-control-colors-expected.txt
>index 427a7a809fa452268b1edfa1731d9039eeca4e7a..1bb56168d06679684560c4fff6849ed31af69dfc 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 : rgba(0, 0, 0, 0)
> 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/fast/css/apple-system-control-colors-expected.txt b/LayoutTests/platform/mac/fast/css/apple-system-control-colors-expected.txt
>index f913ab66fcf0688fb887844b47a6bdf10bcd4645..7614b1c3d8f13779853d24e9015ffb373c388a51 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)
> 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