The macro USE_UIKIT_KEYBOARD_ADDITIONS was used to guard functionality pre Mac Cataylst and iOS 13. Those ships have sailed. So, always enable it and remove the macro.
Created attachment 396873 [details] Patch
I wrote patch on top of the patch for bug #210697. Maybe that explains the conflict or maybe not being at ToT is it. I'll figure it out and rebase shortly.
Comment on attachment 396873 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396873&action=review > Source/WebCore/dom/KeyboardEvent.cpp:115 > +#if USE(COCOA) No such thing. Should be PLATFORM(COCOA) for this any throughout this patch.