Skip to content

Commit

Permalink
[macOS] Eliminate macOS 10.14 availability check
Browse files Browse the repository at this point in the history
Now that the macOS embedders have all been updated to use a minimum
macOS SDK of 10.14, eliminate the remaining @available checks dependent
on that version.

Issue: flutter/flutter#114445
  • Loading branch information
cbracken committed Nov 10, 2022
1 parent a71c0c6 commit b7a970f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -216,30 +216,6 @@
break;
}
case ui::AXEventGenerator::Event::LIVE_REGION_CHANGED: {
if (@available(macOS 10.14, *)) {
// Do nothing on macOS >=10.14.
} else {
// Uses the announcement API to get around OS <= 10.13 VoiceOver bug
// where it stops announcing live regions after the first time focus
// leaves any content area.
// Unfortunately this produces an annoying boing sound with each live
// announcement, but the alternative is almost no live region support.
NSString* announcement = [[NSString alloc]
initWithUTF8String:mac_platform_node_delegate->GetLiveRegionText().c_str()];
NSDictionary* notification_info = @{
NSAccessibilityAnnouncementKey : announcement,
NSAccessibilityPriorityKey : @(NSAccessibilityPriorityLow)
};
// Triggers VoiceOver speech and show on Braille display, if available.
// The Braille will only appear for a few seconds, and then will be replaced
// with the previous announcement.
events.push_back({
.name = NSAccessibilityAnnouncementRequestedNotification,
.target = [NSApp mainWindow],
.user_info = notification_info,
});
break;
}
// Uses native VoiceOver support for live regions.
events.push_back({
.name = kAccessibilityLiveRegionChangedNotification,
Expand Down
8 changes: 0 additions & 8 deletions vulkan/procs/vulkan_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@
#endif // VK_USE_PLATFORM_FUCHSIA
#endif // OS_FUCHSIA

// TODO(dnfield): vulkan_metal.h has some unguarded availability checks for
// macOS 10.13. We can remove this if we bump to 10.14 or if that gets fixed
// upstream, but fixing it upstream will take some time to flow through to
// ANGLE's DEPS.
#ifdef VK_USE_PLATFORM_METAL_EXT
#undef VK_USE_PLATFORM_METAL_EXT
#endif // VK_USE_PLATFORM_METAL_EXT

#include <vulkan/vulkan.h>

#define VK_CALL_LOG_ERROR(expression) \
Expand Down

0 comments on commit b7a970f

Please sign in to comment.