Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[macOS Sonoma] Update SPI headers now that -[NSView clipsToBounds] is API #15254

Merged
merged 1 commit into from
Jun 23, 2023
Merged

[macOS Sonoma] Update SPI headers now that -[NSView clipsToBounds] is API #15254

merged 1 commit into from
Jun 23, 2023

Conversation

emw-apple
Copy link
Contributor

@emw-apple emw-apple commented Jun 23, 2023 •
edited by webkit-early-warning-system

48d9a42

[macOS Sonoma] Update SPI headers now that -[NSView clipsToBounds] is API
https://bugs.webkit.org/show_bug.cgi?id=258473

Reviewed by Alexey Proskuryakov and Jonathan Bedard.

Work towards making the build functional on macOS Sonoma.

* Source/WTF/wtf/PlatformHave.h: Add a HAVE_NSVIEW_CLIPSTOBOUNDS_API
  flag.
* Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h: Only declare clipsToBounds
  on older SDK versions.

Canonical link: https://commits.webkit.org/265490@main

42a723b

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc ✅ 🧪 api-ios   🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 tv-sim ✅ 🧪 jsc-armv7-tests
✅ 🛠 🧪 merge ✅ 🛠 watch ✅ 🛠 jsc-mips
✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

@emw-apple emw-apple self-assigned this Jun 23, 2023
@emw-apple emw-apple added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Jun 23, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 1515225)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2   🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc ✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 tv-sim ✅ 🧪 jsc-armv7-tests
✅ 🛠 watch ✅ 🛠 jsc-mips
✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

JonWBedard
JonWBedard reviewed Jun 23, 2023
View reviewed changes
Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h
@@ -49,7 +49,9 @@ typedef NS_ENUM(NSInteger, NSViewSemanticContext) {
@property (nonatomic, setter=_setSemanticContext:) NSViewSemanticContext _semanticContext;
#endif

#if !HAVE(NSVIEW_CLIPSTOBOUNDS_API)
@property BOOL clipsToBounds;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason this property wasn't guarded before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clipsToBounds has been SPI for a long time, but was just promoted to API. See https://developer.apple.com/documentation/appkit/nsview/4236466-clipstobounds?language=objc&changes=latest_minor: available since 10.9, but added to the SDK in this release.

aproskuryakov
aproskuryakov approved these changes Jun 23, 2023
View reviewed changes
Source/WTF/wtf/PlatformHave.h Outdated
@@ -1567,3 +1567,7 @@
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_LS_SERVER_CONNECTION_STATUS_RELEASE_NOTIFICATIONS_MASK 1
#endif

#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be MAX_ALLOWED? So that we don't unnecessarily complicate building for 10.13 using 10.14 SDK.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch. It's declared in the 14 SDK, so we should be checking SDK version and not deployment target.

@emw-apple emw-apple force-pushed the eng/macOS-Sonoma-Update-SPI-headers-now-that--NSView-clipsToBounds-is-API branch from 1515225 to 42a723b Compare June 23, 2023 21:05
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 42a723b)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc ✅ 🧪 api-ios   🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 tv-sim ✅ 🧪 jsc-armv7-tests
✅ 🛠 🧪 merge ✅ 🛠 watch ✅ 🛠 jsc-mips
✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

@emw-apple emw-apple added the merge-queue Applied to send a pull request to merge-queue label Jun 23, 2023
@emw-apple
[macOS Sonoma] Update SPI headers now that -[NSView clipsToBounds] is…
48d9a42 
… API

https://bugs.webkit.org/show_bug.cgi?id=258473

Reviewed by Alexey Proskuryakov and Jonathan Bedard.

Work towards making the build functional on macOS Sonoma.

* Source/WTF/wtf/PlatformHave.h: Add a HAVE_NSVIEW_CLIPSTOBOUNDS_API
  flag.
* Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h: Only declare clipsToBounds
  on older SDK versions.

Canonical link: https://commits.webkit.org/265490@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/macOS-Sonoma-Update-SPI-headers-now-that--NSView-clipsToBounds-is-API branch from 42a723b to 48d9a42 Compare June 23, 2023 23:07
@webkit-commit-queue
Copy link
Collaborator

Committed 265490@main (48d9a42): https://commits.webkit.org/265490@main

Reviewed commits have been landed. Closing PR #15254 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 48d9a42 into WebKit:main Jun 23, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jun 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aproskuryakov aproskuryakov aproskuryakov approved these changes

@JonWBedard JonWBedard JonWBedard approved these changes

@patrickangle patrickangle Awaiting requested review from patrickangle

Assignees

@emw-apple emw-apple

Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
Milestone
No milestone
5 participants
@emw-apple @webkit-early-warning-system @webkit-commit-queue @aproskuryakov @JonWBedard