Skip to content

[iOS] Adopt API replacements for returning an "acting parent UIScrollView"#21289

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
whsieh:eng/265801
Dec 4, 2023
Merged

[iOS] Adopt API replacements for returning an "acting parent UIScrollView"#21289
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
whsieh:eng/265801

Conversation

@whsieh
Copy link
Copy Markdown
Member

@whsieh whsieh commented Dec 4, 2023

591cf10

[iOS] Adopt API replacements for returning an "acting parent UIScrollView"
https://bugs.webkit.org/show_bug.cgi?id=265801
rdar://119141181

Reviewed by Aditya Keerthi and Megan Gardner.

Adopt a soon-to-be API replacement for this SPI scroll view delegate method:

```
-[UIScrollViewDelegate _actingParentScrollViewForScrollView:]
```

The replacement is just a subclassing hook on `UIScrollView` directly, which we can easily route
through our own `WKBaseScrollViewDelegate`, which allows us to share an implementation with the
legacy `-_actingParentScrollViewForScrollView:` delegate method.

* Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
(-[WKScrollingNodeScrollViewDelegate _actingParentScrollViewForScrollView:]):
(-[WKScrollingNodeScrollViewDelegate actingParentScrollViewForScrollView:]):
* Source/WebKit/UIProcess/ios/WKBaseScrollView.h:
* Source/WebKit/UIProcess/ios/WKBaseScrollView.mm:
(-[WKBaseScrollView _actingParentScrollView]):

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

88aae6b

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

@whsieh whsieh requested a review from cdumez as a code owner December 4, 2023 19:33
@whsieh whsieh self-assigned this Dec 4, 2023
@whsieh whsieh added the Platform Portability improvements and other general platform improvements not driven directly by site bugs. label Dec 4, 2023
@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Dec 4, 2023

Copy link
Copy Markdown
Member

@aprotyas aprotyas left a comment

Choose a reason for hiding this comment

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

LGTM

@whsieh whsieh added the merge-queue Applied to send a pull request to merge-queue label Dec 4, 2023
…View"

https://bugs.webkit.org/show_bug.cgi?id=265801
rdar://119141181

Reviewed by Aditya Keerthi and Megan Gardner.

Adopt a soon-to-be API replacement for this SPI scroll view delegate method:

```
-[UIScrollViewDelegate _actingParentScrollViewForScrollView:]
```

The replacement is just a subclassing hook on `UIScrollView` directly, which we can easily route
through our own `WKBaseScrollViewDelegate`, which allows us to share an implementation with the
legacy `-_actingParentScrollViewForScrollView:` delegate method.

* Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
(-[WKScrollingNodeScrollViewDelegate _actingParentScrollViewForScrollView:]):
(-[WKScrollingNodeScrollViewDelegate actingParentScrollViewForScrollView:]):
* Source/WebKit/UIProcess/ios/WKBaseScrollView.h:
* Source/WebKit/UIProcess/ios/WKBaseScrollView.mm:
(-[WKBaseScrollView _actingParentScrollView]):

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

Committed 271512@main (591cf10): https://commits.webkit.org/271512@main

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

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 4, 2023
@whsieh whsieh deleted the eng/265801 branch December 4, 2023 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Platform Portability improvements and other general platform improvements not driven directly by site bugs.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants