Title: [266736] trunk/Source
- Revision
- 266736
- Author
- [email protected]
- Date
- 2020-09-08 11:55:00 -0700 (Tue, 08 Sep 2020)
Log Message
Switch from deprecated secondarySelectedControlColor to unemphasizedSelectedContentBackgroundColor.
https://bugs.webkit.org/show_bug.cgi?id=216207
Reviewed by Darin Adler.
Source/WebCore:
No behavior change.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
(WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
(WebCore::RenderThemeMac::systemColor const):
Source/WebKitLegacy/mac:
* Plugins/WebPluginController.mm:
(-[WebPluginController webPlugInContainerSelectionColor]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (266735 => 266736)
--- trunk/Source/WebCore/ChangeLog 2020-09-08 18:49:59 UTC (rev 266735)
+++ trunk/Source/WebCore/ChangeLog 2020-09-08 18:55:00 UTC (rev 266736)
@@ -1,3 +1,17 @@
+2020-09-08 Megan Gardner <[email protected]>
+
+ Switch from deprecated secondarySelectedControlColor to unemphasizedSelectedContentBackgroundColor.
+ https://bugs.webkit.org/show_bug.cgi?id=216207
+
+ Reviewed by Darin Adler.
+
+ No behavior change.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::systemColor const):
+
2020-09-08 Alex Christensen <[email protected]>
Derive big5, jis0208 and jis0212 tables from ICU
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (266735 => 266736)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2020-09-08 18:49:59 UTC (rev 266735)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2020-09-08 18:55:00 UTC (rev 266736)
@@ -426,9 +426,7 @@
return colorFromNSColor([NSColor unemphasizedSelectedTextBackgroundColor]);
#else
UNUSED_PARAM(options);
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- return colorFromNSColor([NSColor secondarySelectedControlColor]);
- ALLOW_DEPRECATED_DECLARATIONS_END
+ return colorFromNSColor([NSColor unemphasizedSelectedContentBackgroundColor]);
#endif
}
@@ -488,13 +486,11 @@
{
#if HAVE(OS_DARK_MODE_SUPPORT)
LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseDarkAppearance));
- return colorFromNSColor([NSColor unemphasizedSelectedContentBackgroundColor]);
#else
UNUSED_PARAM(options);
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- return colorFromNSColor([NSColor secondarySelectedControlColor]);
- ALLOW_DEPRECATED_DECLARATIONS_END
#endif
+ return colorFromNSColor([NSColor unemphasizedSelectedContentBackgroundColor]);
+
}
Color RenderThemeMac::platformActiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
@@ -694,13 +690,7 @@
case CSSValueAppleSystemAlternateSelectedText:
return @selector(alternateSelectedControlTextColor);
case CSSValueAppleSystemUnemphasizedSelectedContentBackground:
-#if HAVE(OS_DARK_MODE_SUPPORT)
return @selector(unemphasizedSelectedContentBackgroundColor);
-#else
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- return @selector(secondarySelectedControlColor);
- ALLOW_DEPRECATED_DECLARATIONS_END
-#endif
case CSSValueAppleSystemSelectedText:
return @selector(selectedTextColor);
case CSSValueAppleSystemUnemphasizedSelectedText:
@@ -713,9 +703,7 @@
#if HAVE(OS_DARK_MODE_SUPPORT)
return @selector(unemphasizedSelectedTextBackgroundColor);
#else
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- return @selector(secondarySelectedControlColor);
- ALLOW_DEPRECATED_DECLARATIONS_END
+ return @selector(unemphasizedSelectedContentBackgroundColor);
#endif
case CSSValueAppleSystemPlaceholderText:
return @selector(placeholderTextColor);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (266735 => 266736)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-09-08 18:49:59 UTC (rev 266735)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-09-08 18:55:00 UTC (rev 266736)
@@ -1,3 +1,13 @@
+2020-09-08 Megan Gardner <[email protected]>
+
+ Switch from deprecated secondarySelectedControlColor to unemphasizedSelectedContentBackgroundColor.
+ https://bugs.webkit.org/show_bug.cgi?id=216207
+
+ Reviewed by Darin Adler.
+
+ * Plugins/WebPluginController.mm:
+ (-[WebPluginController webPlugInContainerSelectionColor]):
+
2020-09-02 Darin Adler <[email protected]>
Remove EAffinity, UPSTREAM, DOWNSTREAM, SEL_DEFAULT_AFFINITY, and VisibleSelection::selectionType
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm (266735 => 266736)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm 2020-09-08 18:49:59 UTC (rev 266735)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm 2020-09-08 18:55:00 UTC (rev 266736)
@@ -538,9 +538,7 @@
bool primary = true;
if (auto* frame = core([self webFrame]))
primary = frame->selection().isFocusedAndActive();
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- return primary ? [NSColor selectedTextBackgroundColor] : [NSColor secondarySelectedControlColor];
- ALLOW_DEPRECATED_DECLARATIONS_END
+ return primary ? [NSColor selectedTextBackgroundColor] : [NSColor unemphasizedSelectedContentBackgroundColor];
}
// For compatibility only.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
