Skip to content

Conversation

pxlcoder
Copy link
Member

@pxlcoder pxlcoder commented Feb 17, 2025

dfce27a

Fix internal iOS builds following 290280@main
https://bugs.webkit.org/show_bug.cgi?id=287807
rdar://144991668

Reviewed by Abrar Rahman Protyasha.

SwiftUI.framework is unavailable in some images where WebKit.framework is
available. Weak link SwiftUI to avoid build failures in those places.

* Source/WebKit/Platform/cocoa/WKMaterialHostingSupport.h:

Introduce an availability check to avoid crashing in places where SwiftUI
is unavailable.

* Source/WebKit/Platform/cocoa/WKMaterialHostingSupport.swift:
(WKMaterialHostingSupport.isMaterialHostingAvailable):
* Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::makeNode):
* Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
(WebKit::RemoteLayerTreeHost::makeNode):

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

ae6a223

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🧪 wpe-wk2 🧪 win-tests
✅ 🧪 webkitperl 🧪 ios-wk2 🧪 api-mac 🧪 api-wpe
🧪 ios-wk2-wpt 🛠 wpe-cairo
🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision 🧪 mac-AS-debug-wk2 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
🧪 vision-wk2 🧪 mac-intel-wk2 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv 🛠 mac-safer-cpp
🛠 tv-sim
🛠 watch
🛠 watch-sim

@pxlcoder pxlcoder requested a review from cdumez as a code owner February 17, 2025 19:26
@pxlcoder pxlcoder self-assigned this Feb 17, 2025
@pxlcoder pxlcoder added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label Feb 17, 2025
@pxlcoder pxlcoder added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 17, 2025
https://bugs.webkit.org/show_bug.cgi?id=287807
rdar://144991668

Reviewed by Abrar Rahman Protyasha.

SwiftUI.framework is unavailable in some images where WebKit.framework is
available. Weak link SwiftUI to avoid build failures in those places.

* Source/WebKit/Platform/cocoa/WKMaterialHostingSupport.h:

Introduce an availability check to avoid crashing in places where SwiftUI
is unavailable.

* Source/WebKit/Platform/cocoa/WKMaterialHostingSupport.swift:
(WKMaterialHostingSupport.isMaterialHostingAvailable):
* Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::makeNode):
* Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
(WebKit::RemoteLayerTreeHost::makeNode):

Canonical link: https://commits.webkit.org/290493@main
@webkit-commit-queue
Copy link
Collaborator

Committed 290493@main (dfce27a): https://commits.webkit.org/290493@main

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

@webkit-commit-queue webkit-commit-queue merged commit dfce27a into WebKit:main Feb 17, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
New Bugs Unclassified bugs are placed in this component until the correct component can be determined.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants