⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 239904 in webkit


Ignore:
Timestamp:
Jan 12, 2019, 9:54:06 PM (8 years ago)
Author:
timothy@apple.com
Message:

Have prefers-color-scheme: light always match on macOS versions before Mojave.
​https://bugs.webkit.org/show_bug.cgi?id=191655
rdar://problem/46074680

Reviewed by Megan Gardner.

Source/JavaScriptCore:

  • Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.

Source/WebCore:

Tests: css-dark-mode/older-systems/prefers-color-scheme.html

css-dark-mode/older-systems/supported-color-schemes-css.html
css-dark-mode/older-systems/supported-color-schemes.html

Use new HAVE(OS_DARK_MODE_SUPPORT) to make it easier to find code.
Added HAVE(OS_DARK_MODE_SUPPORT) around more bits to make it work on older systems.

  • Configurations/FeatureDefines.xcconfig:
  • dom/Document.cpp:

(WebCore::Document::useDarkAppearance const):

  • inspector/agents/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::enable):

  • page/Page.cpp:

(WebCore::Page::setUseDarkAppearance):
(WebCore::Page::useDarkAppearance const):
(WebCore::Page::setUseDarkAppearanceOverride):

  • platform/mac/LocalDefaultSystemAppearance.h:

(WebCore::LocalDefaultSystemAppearance::usingDarkAppearance const):

  • platform/mac/LocalDefaultSystemAppearance.mm:

(WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
(WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance):

  • platform/mac/ScrollAnimatorMac.mm:
  • rendering/RenderThemeMac.mm:

(-[WebCoreTextFieldCell _adjustedCoreUIDrawOptionsForDrawingBordersOnly:]):
(-[WebListButtonCell drawWithFrame:inView:]):
(WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
(WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const):
(WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const):
(WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
(WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const):
(WebCore::RenderThemeMac::systemColor const):

Source/WebCore/PAL:

  • Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.

Source/WebKit:

  • Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
  • UIProcess/Cocoa/WebViewImpl.mm:

(WebKit::WebViewImpl::effectiveAppearanceIsDark):

  • UIProcess/RemoteLayerTree/mac/ScrollerMac.mm:

Source/WebKitLegacy/mac:

  • Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
  • WebView/WebView.mm:

(-[WebView _effectiveAppearanceIsDark]):

Source/WTF:

  • wtf/Platform.h: Define HAVE_OS_DARK_MODE_SUPPORT on macOS 10.14.

Tools:

  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
  • TestWebKitAPI/Tests/WebKit/mac/ForceLightAppearanceInBundle.mm:

LayoutTests:

  • css-dark-mode/older-systems/prefers-color-scheme-expected.txt: Added.
  • css-dark-mode/older-systems/prefers-color-scheme.html: Added.
  • css-dark-mode/older-systems/supported-color-schemes-css-expected.txt: Added.
  • css-dark-mode/older-systems/supported-color-schemes-css.html: Added.
  • css-dark-mode/older-systems/supported-color-schemes-expected.txt: Added.
  • css-dark-mode/older-systems/supported-color-schemes.html: Added.
  • platform/mac/TestExpectations:
Location:
trunk
Files:
7 added
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r239888 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * css-dark-mode/older-systems/prefers-color-scheme-expected.txt: Added.
     10        * css-dark-mode/older-systems/prefers-color-scheme.html: Added.
     11        * css-dark-mode/older-systems/supported-color-schemes-css-expected.txt: Added.
     12        * css-dark-mode/older-systems/supported-color-schemes-css.html: Added.
     13        * css-dark-mode/older-systems/supported-color-schemes-expected.txt: Added.
     14        * css-dark-mode/older-systems/supported-color-schemes.html: Added.
     15        * platform/mac/TestExpectations:
     16
    1172019-01-11  John Wilander  <wilander@apple.com>
    218

  • trunk/LayoutTests/platform/mac/TestExpectations

    r239832 r239904  
    17681768# Dark Mode is Mojave and later.
    17691769[ Mojave+ ] css-dark-mode [ Pass ]
     1770[ Mojave+ ] css-dark-mode/older-systems [ Skip ]
    17701771[ Mojave+ ] inspector/css/force-page-appearance.html [ Pass ]
     1772
     1773# Test Dark Mode CSS support for light mode on older systems.
     1774[ Sierra HighSierra ] css-dark-mode/older-systems [ Pass ]
    17711775
    17721776webkit.org/b/185651 legacy-animation-engine/animations/play-state-in-shorthand.html [ Pass Failure ]

  • trunk/Source/JavaScriptCore/ChangeLog

    r239898 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
     10
    1112019-01-12  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
    212

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r239888 r239904  
    114114
    115115ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
    116 ENABLE_DARK_MODE_CSS_macosx = $(ENABLE_DARK_MODE_CSS$(WK_MACOS_1014));
    117 ENABLE_DARK_MODE_CSS_MACOS_SINCE_1014 = ENABLE_DARK_MODE_CSS;
     116ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
    118117
    119118ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));

  • trunk/Source/WTF/ChangeLog

    r239894 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * wtf/Platform.h: Define HAVE_OS_DARK_MODE_SUPPORT on macOS 10.14.
     10
    1112019-01-11  David Kilzer  <ddkilzer@apple.com>
    212

  • trunk/Source/WTF/wtf/Platform.h

    r239884 r239904  
    14181418
    14191419#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     1420#define HAVE_OS_DARK_MODE_SUPPORT 1
     1421#endif
     1422
     1423#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
    14201424#define HAVE_CG_FONT_RENDERING_GET_FONT_SMOOTHING_DISABLED 1
    14211425#endif

  • trunk/Source/WebCore/ChangeLog

    r239903 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        Tests: css-dark-mode/older-systems/prefers-color-scheme.html
     10               css-dark-mode/older-systems/supported-color-schemes-css.html
     11               css-dark-mode/older-systems/supported-color-schemes.html
     12
     13        Use new HAVE(OS_DARK_MODE_SUPPORT) to make it easier to find code.
     14        Added HAVE(OS_DARK_MODE_SUPPORT) around more bits to make it work on older systems.
     15
     16        * Configurations/FeatureDefines.xcconfig:
     17        * dom/Document.cpp:
     18        (WebCore::Document::useDarkAppearance const):
     19        * inspector/agents/InspectorPageAgent.cpp:
     20        (WebCore::InspectorPageAgent::enable):
     21        * page/Page.cpp:
     22        (WebCore::Page::setUseDarkAppearance):
     23        (WebCore::Page::useDarkAppearance const):
     24        (WebCore::Page::setUseDarkAppearanceOverride):
     25        * platform/mac/LocalDefaultSystemAppearance.h:
     26        (WebCore::LocalDefaultSystemAppearance::usingDarkAppearance const):
     27        * platform/mac/LocalDefaultSystemAppearance.mm:
     28        (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
     29        (WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance):
     30        * platform/mac/ScrollAnimatorMac.mm:
     31        * rendering/RenderThemeMac.mm:
     32        (-[WebCoreTextFieldCell _adjustedCoreUIDrawOptionsForDrawingBordersOnly:]):
     33        (-[WebListButtonCell drawWithFrame:inView:]):
     34        (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
     35        (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const):
     36        (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const):
     37        (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
     38        (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const):
     39        (WebCore::RenderThemeMac::systemColor const):
     40
    1412019-01-12  Zalan Bujtas  <zalan@apple.com>
    242

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r239888 r239904  
    114114
    115115ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
    116 ENABLE_DARK_MODE_CSS_macosx = $(ENABLE_DARK_MODE_CSS$(WK_MACOS_1014));
    117 ENABLE_DARK_MODE_CSS_MACOS_SINCE_1014 = ENABLE_DARK_MODE_CSS;
     116ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
    118117
    119118ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));

  • trunk/Source/WebCore/PAL/ChangeLog

    r239901 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
     10
    1112019-01-12  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r239888 r239904  
    114114
    115115ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
    116 ENABLE_DARK_MODE_CSS_macosx = $(ENABLE_DARK_MODE_CSS$(WK_MACOS_1014));
    117 ENABLE_DARK_MODE_CSS_MACOS_SINCE_1014 = ENABLE_DARK_MODE_CSS;
     116ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
    118117
    119118ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));

  • trunk/Source/WebCore/dom/Document.cpp

    r239864 r239904  
    74207420bool Document::useDarkAppearance(const RenderStyle* style) const
    74217421{
     7422#if HAVE(OS_DARK_MODE_SUPPORT)
    74227423#if ENABLE(DARK_MODE_CSS)
    74237424    OptionSet<ColorSchemes> supportedColorSchemes;
    … …  
    74477448    if (supportedColorSchemes.contains(ColorSchemes::Dark))
    74487449        return pageUsesDarkAppearance;
     7450#endif
     7451#else
     7452    UNUSED_PARAM(style);
    74497453#endif
    74507454

  • trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp

    r239535 r239904  
    302302    stopwatch->start();
    303303
    304 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     304#if HAVE(OS_DARK_MODE_SUPPORT)
    305305    defaultAppearanceDidChange(m_page.defaultUseDarkAppearance());
    306306#endif

  • trunk/Source/WebCore/page/Page.cpp

    r239663 r239904  
    26672667void Page::setUseDarkAppearance(bool value)
    26682668{
     2669#if HAVE(OS_DARK_MODE_SUPPORT)
    26692670    if (m_useDarkAppearance == value)
    26702671        return;
    … …  
    26752676
    26762677    appearanceDidChange();
     2678#else
     2679    UNUSED_PARAM(value);
     2680#endif
    26772681}
    26782682
    26792683bool Page::useDarkAppearance() const
    26802684{
     2685#if HAVE(OS_DARK_MODE_SUPPORT)
    26812686    FrameView* view = mainFrame().view();
    26822687    if (!view || !equalLettersIgnoringASCIICase(view->mediaType(), "screen"))
    … …  
    26852690        return m_useDarkAppearanceOverride.value();
    26862691    return m_useDarkAppearance;
     2692#else
     2693    return false;
     2694#endif
    26872695}
    26882696
    26892697void Page::setUseDarkAppearanceOverride(Optional<bool> valueOverride)
    26902698{
     2699#if HAVE(OS_DARK_MODE_SUPPORT)
    26912700    if (valueOverride == m_useDarkAppearanceOverride)
    26922701        return;
    … …  
    26952704
    26962705    appearanceDidChange();
     2706#else
     2707    UNUSED_PARAM(valueOverride);
     2708#endif
    26972709}
    26982710

  • trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h

    r237204 r239904  
    4646    bool usingDarkAppearance() const
    4747    {
    48 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     48#if HAVE(OS_DARK_MODE_SUPPORT)
    4949        return m_usingDarkAppearance;
    5050#else
    … …  
    5454
    5555private:
    56 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     56#if HAVE(OS_DARK_MODE_SUPPORT)
    5757    RetainPtr<NSAppearance> m_savedSystemAppearance;
    5858    bool m_usingDarkAppearance { false };

  • trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm

    r237204 r239904  
    3434LocalDefaultSystemAppearance::LocalDefaultSystemAppearance(bool useDarkAppearance)
    3535{
    36 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     36#if HAVE(OS_DARK_MODE_SUPPORT)
    3737    m_savedSystemAppearance = [NSAppearance currentAppearance];
    3838    m_usingDarkAppearance = useDarkAppearance;
    … …  
    4646LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance()
    4747{
    48 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     48#if HAVE(OS_DARK_MODE_SUPPORT)
    4949    [NSAppearance setCurrentAppearance:m_savedSystemAppearance.get()];
    5050#endif

  • trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

    r239689 r239904  
    528528}
    529529
    530 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     530#if HAVE(OS_DARK_MODE_SUPPORT)
    531531- (NSAppearance *)effectiveAppearanceForScrollerImp:(NSScrollerImp *)scrollerImp
    532532{

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r239786 r239904  
    163163- (CFDictionaryRef)_adjustedCoreUIDrawOptionsForDrawingBordersOnly:(CFDictionaryRef)defaultOptions
    164164{
    165 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     165#if HAVE(OS_DARK_MODE_SUPPORT)
    166166    // Dark mode controls don't have borders, just a semi-transparent background of shadows.
    167167    // In the dark mode case we can't disable borders, or we will not paint anything for the control.
    … …  
    236236    // FIXME: Obtain the gradient colors from CoreUI or AppKit
    237237    RetainPtr<NSGradient> gradient;
    238 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     238#if HAVE(OS_DARK_MODE_SUPPORT)
    239239    NSUserAccentColor accentColor = NSColorGetUserAccentColor();
    240240    if (accentColor == NSUserAccentColorRed)
    … …  
    399399Color RenderThemeMac::platformInactiveSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
    400400{
    401 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     401#if HAVE(OS_DARK_MODE_SUPPORT)
    402402    LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseDarkAppearance));
    403403    return colorFromNSColor([NSColor unemphasizedSelectedTextBackgroundColor]);
    … …  
    436436Color RenderThemeMac::platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
    437437{
    438 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     438#if HAVE(OS_DARK_MODE_SUPPORT)
    439439    LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseDarkAppearance));
    440440    if (localAppearance.usingDarkAppearance())
    … …  
    449449Color RenderThemeMac::platformActiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
    450450{
    451 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     451#if HAVE(OS_DARK_MODE_SUPPORT)
    452452    LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseDarkAppearance));
    453453    return colorFromNSColor([NSColor selectedContentBackgroundColor]);
    … …  
    460460Color RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
    461461{
    462 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     462#if HAVE(OS_DARK_MODE_SUPPORT)
    463463    LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseDarkAppearance));
    464464    return colorFromNSColor([NSColor unemphasizedSelectedContentBackgroundColor]);
    … …  
    477477Color RenderThemeMac::platformInactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
    478478{
    479 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     479#if HAVE(OS_DARK_MODE_SUPPORT)
    480480    LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseDarkAppearance));
    481481    return colorFromNSColor([NSColor unemphasizedSelectedTextColor]);
    … …  
    660660
    661661        case CSSValueAppleSystemControlAccent:
    662 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     662#if HAVE(OS_DARK_MODE_SUPPORT)
    663663            return systemAppearanceColor(cache.systemControlAccentColor, @selector(controlAccentColor));
    664664#else
    … …  
    741741                return @selector(alternateSelectedControlTextColor);
    742742            case CSSValueAppleSystemUnemphasizedSelectedContentBackground:
    743 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     743#if HAVE(OS_DARK_MODE_SUPPORT)
    744744                return @selector(unemphasizedSelectedContentBackgroundColor);
    745745#else
    … …  
    749749                return @selector(selectedTextColor);
    750750            case CSSValueAppleSystemUnemphasizedSelectedText:
    751 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     751#if HAVE(OS_DARK_MODE_SUPPORT)
    752752                return @selector(unemphasizedSelectedTextColor);
    753753#else
    … …  
    755755#endif
    756756            case CSSValueAppleSystemUnemphasizedSelectedTextBackground:
    757 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     757#if HAVE(OS_DARK_MODE_SUPPORT)
    758758                return @selector(unemphasizedSelectedTextBackgroundColor);
    759759#else
    … …  
    770770#endif
    771771            case CSSValueAppleSystemContainerBorder:
    772 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     772#if HAVE(OS_DARK_MODE_SUPPORT)
    773773                return @selector(containerBorderColor);
    774774#else
    … …  
    787787                return @selector(gridColor);
    788788            case CSSValueAppleSystemSeparator:
    789 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     789#if HAVE(OS_DARK_MODE_SUPPORT)
    790790                return @selector(separatorColor);
    791791#else
    … …  
    870870#endif
    871871
    872 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
     872#if !HAVE(OS_DARK_MODE_SUPPORT)
    873873        case CSSValueAppleSystemContainerBorder:
    874874            return 0xFFC5C5C5;
    … …  
    876876
    877877        case CSSValueAppleSystemEvenAlternatingContentBackground: {
    878 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     878#if HAVE(OS_DARK_MODE_SUPPORT)
    879879            NSArray<NSColor *> *alternateColors = [NSColor alternatingContentBackgroundColors];
    880880#else
    … …  
    886886
    887887        case CSSValueAppleSystemOddAlternatingContentBackground: {
    888 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     888#if HAVE(OS_DARK_MODE_SUPPORT)
    889889            NSArray<NSColor *> *alternateColors = [NSColor alternatingContentBackgroundColors];
    890890#else

  • trunk/Source/WebKit/ChangeLog

    r239901 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
     10        * UIProcess/Cocoa/WebViewImpl.mm:
     11        (WebKit::WebViewImpl::effectiveAppearanceIsDark):
     12        * UIProcess/RemoteLayerTree/mac/ScrollerMac.mm:
     13
    1142019-01-12  Dan Bernstein  <mitz@apple.com>
    215

  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r239888 r239904  
    114114
    115115ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
    116 ENABLE_DARK_MODE_CSS_macosx = $(ENABLE_DARK_MODE_CSS$(WK_MACOS_1014));
    117 ENABLE_DARK_MODE_CSS_MACOS_SINCE_1014 = ENABLE_DARK_MODE_CSS;
     116ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
    118117
    119118ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r239901 r239904  
    53295329bool WebViewImpl::effectiveAppearanceIsDark()
    53305330{
    5331 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     5331#if HAVE(OS_DARK_MODE_SUPPORT)
    53325332    NSAppearanceName appearance = [[m_view effectiveAppearance] bestMatchFromAppearancesWithNames:@[ NSAppearanceNameAqua, NSAppearanceNameDarkAqua ]];
    53335333    return [appearance isEqualToString:NSAppearanceNameDarkAqua];

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/mac/ScrollerMac.mm

    r239689 r239904  
    196196}
    197197
    198 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     198#if HAVE(OS_DARK_MODE_SUPPORT)
    199199- (NSAppearance *)effectiveAppearanceForScrollerImp:(NSScrollerImp *)scrollerImp
    200200{

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r239901 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
     10        * WebView/WebView.mm:
     11        (-[WebView _effectiveAppearanceIsDark]):
     12
    1132019-01-12  Dan Bernstein  <mitz@apple.com>
    214

  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r239888 r239904  
    114114
    115115ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
    116 ENABLE_DARK_MODE_CSS_macosx = $(ENABLE_DARK_MODE_CSS$(WK_MACOS_1014));
    117 ENABLE_DARK_MODE_CSS_MACOS_SINCE_1014 = ENABLE_DARK_MODE_CSS;
     116ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
    118117
    119118ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r239737 r239904  
    52985298- (bool)_effectiveAppearanceIsDark
    52995299{
    5300 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     5300#if HAVE(OS_DARK_MODE_SUPPORT)
    53015301    NSAppearanceName appearance = [[self effectiveAppearance] bestMatchFromAppearancesWithNames:@[ NSAppearanceNameAqua, NSAppearanceNameDarkAqua ]];
    53025302    return [appearance isEqualToString:NSAppearanceNameDarkAqua];

  • trunk/Tools/ChangeLog

    r239901 r239904  
     12019-01-12  Timothy Hatcher  <timothy@apple.com>
     2
     3        Have prefers-color-scheme: light always match on macOS versions before Mojave.
     4        https://bugs.webkit.org/show_bug.cgi?id=191655
     5        rdar://problem/46074680
     6
     7        Reviewed by Megan Gardner.
     8
     9        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: ENABLE_DARK_MODE_CSS_macosx for all OS versions.
     10        * TestWebKitAPI/Tests/WebKit/mac/ForceLightAppearanceInBundle.mm:
     11
    1122019-01-12  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r239888 r239904  
    114114
    115115ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
    116 ENABLE_DARK_MODE_CSS_macosx = $(ENABLE_DARK_MODE_CSS$(WK_MACOS_1014));
    117 ENABLE_DARK_MODE_CSS_MACOS_SINCE_1014 = ENABLE_DARK_MODE_CSS;
     116ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
    118117
    119118ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ForceLightAppearanceInBundle.mm

    r239851 r239904  
    2626#include "config.h"
    2727
    28 #if ENABLE(DARK_MODE_CSS) && WK_HAVE_C_SPI
     28#if ENABLE(DARK_MODE_CSS) && HAVE(OS_DARK_MODE_SUPPORT) && WK_HAVE_C_SPI
    2929
    3030#include "PlatformUtilities.h"
Note: See TracChangeset for help on using the changeset viewer.