Upstream has been updated with the new syntax.
Created attachment 454209 [details] Patch
Created attachment 454211 [details] Patch for landing
Committed r291036 (248210@main): <https://commits.webkit.org/248210@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454211 [details].
<rdar://problem/90023157>