diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h index ec4347a7677a..2c81d34cbecc 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -1314,10 +1314,7 @@ #define HAVE_LOCKDOWN_MODE_PDF_ADDITIONS 1 #endif -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600) \ - || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \ - || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \ - || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) +#if PLATFORM(COCOA) #define HAVE_ACCESSIBILITY_FRAMEWORK 1 #endif @@ -1342,7 +1339,7 @@ #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) -#define HAVE_ACCESSIBILITY_ANIMATED_IMAGES 1 +#define HAVE_ACCESSIBILITY_ANIMATED_IMAGE_CONTROL 1 #endif #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160100 diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm index cf85e2412b96..b15b7bf5ca66 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -183,7 +183,7 @@ static bool canaryInBaseState() SOFT_LINK(BackBoardServices, BKSDisplayBrightnessGetCurrent, float, (), ()); #endif -#if HAVE(ACCESSIBILITY_ANIMATED_IMAGES) +#if HAVE(ACCESSIBILITY_ANIMATED_IMAGE_CONTROL) SOFT_LINK_LIBRARY_OPTIONAL(libAccessibility) SOFT_LINK_OPTIONAL(libAccessibility, _AXSReduceMotionAutoplayAnimatedImagesEnabled, Boolean, (), ()); SOFT_LINK_CONSTANT_MAY_FAIL(libAccessibility, kAXSReduceMotionAutoplayAnimatedImagesChangedNotification, CFStringRef) @@ -267,7 +267,7 @@ static AccessibilityPreferences accessibilityPreferences() preferences.invertColorsEnabled = _AXSInvertColorsEnabledApp(appId.get()); #endif preferences.enhanceTextLegibilityOverall = _AXSEnhanceTextLegibilityEnabled(); -#if HAVE(ACCESSIBILITY_ANIMATED_IMAGES) +#if HAVE(ACCESSIBILITY_ANIMATED_IMAGE_CONTROL) if (auto* functionPointer = _AXSReduceMotionAutoplayAnimatedImagesEnabledPtr()) preferences.imageAnimationEnabled = functionPointer(); #endif @@ -826,7 +826,7 @@ static bool determineIfWeShouldCrashWhenCreatingWebProcess() addCFNotificationObserver(accessibilityPreferencesChangedCallback, kAXSDarkenSystemColorsEnabledNotification); addCFNotificationObserver(accessibilityPreferencesChangedCallback, kAXSInvertColorsEnabledNotification); #endif -#if HAVE(ACCESSIBILITY_ANIMATED_IMAGES) +#if HAVE(ACCESSIBILITY_ANIMATED_IMAGE_CONTROL) if (canLoadkAXSReduceMotionAutoplayAnimatedImagesChangedNotification()) addCFNotificationObserver(accessibilityPreferencesChangedCallback, getkAXSReduceMotionAutoplayAnimatedImagesChangedNotification()); #endif