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.

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

Additional upstream work for visionOS. #15172

Conversation

megangardner
Copy link
Contributor

@megangardner megangardner commented Jun 22, 2023

81ff6b2

Additional upstream work for visionOS.
https://bugs.webkit.org/show_bug.cgi?id=258380
rdar://111134123

Reviewed by Tim Horton.

* Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
(-[WKContentView _shouldAdditionallyRecognizeGestureRecognizer:simultaneouslyWithGestureRecognizer:]): Deleted.

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

ca7bb5a

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe   πŸ›  wincairo
βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl   πŸ§ͺ ios-wk2   πŸ§ͺ api-mac βœ… πŸ›  gtk
βœ… πŸ§ͺ ios-wk2-wpt   πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv   πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@megangardner megangardner self-assigned this Jun 22, 2023
@megangardner megangardner added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Jun 22, 2023
@megangardner megangardner added the merge-queue Applied to send a pull request to merge-queue label Jun 22, 2023
https://bugs.webkit.org/show_bug.cgi?id=258380
rdar://111134123

Reviewed by Tim Horton.

* Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
(-[WKContentView _shouldAdditionallyRecognizeGestureRecognizer:simultaneouslyWithGestureRecognizer:]): Deleted.

Canonical link: https://commits.webkit.org/265387@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Additional-upstream-work-for-visionOS- branch from ca7bb5a to 81ff6b2 Compare June 22, 2023 02:23
@webkit-commit-queue
Copy link
Collaborator

Committed 265387@main (81ff6b2): https://commits.webkit.org/265387@main

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

@webkit-commit-queue webkit-commit-queue merged commit 81ff6b2 into WebKit:main Jun 22, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
Projects
None yet
4 participants