Fix MACCATALYST build failures
<rdar://problem/62111278>
Created attachment 397117 [details] Patch
Created attachment 397124 [details] WIP patch
Created attachment 397135 [details] Patch
Comment on attachment 397135 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397135&action=review In the future feel free to land build fixes unreviewed > Tools/TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm:550 > - IPhoneUserInterfaceSwizzler userInterfaceSwizzler; > + TestWebKitAPI::IPhoneUserInterfaceSwizzler userInterfaceSwizzler; I think someone else already landed this
View in context: https://bugs.webkit.org/attachment.cgi?id=397135&action=review r=me with just a couple nits. > Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:185 > -#if !HAVE(AVKIT) > - return false; > -#else > +#if ENABLE(VIDEO_PRESENTATION_MODE) && !PLATFORM(WATCHOS) > if (!_page || !_page->videoFullscreenManager()) > return false; > > return _page->videoFullscreenManager()->hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModePictureInPicture); > +#else > + return false; Nit: I think it's safe to drop the "!PLATFORM(WATCHOS)" part of this if statement. The manager should already handle that watchOS doesn't support PiP. > Tools/TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm:550 > - IPhoneUserInterfaceSwizzler userInterfaceSwizzler; > + TestWebKitAPI::IPhoneUserInterfaceSwizzler userInterfaceSwizzler; This shouldn't be needed after r260469.
Comment on attachment 397135 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397135&action=review >> Tools/TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm:550 >> + TestWebKitAPI::IPhoneUserInterfaceSwizzler userInterfaceSwizzler; > > I think someone else already landed this Right. dbates landed a patch to fix it. Will revise the patch to remove my fixes.
Created attachment 397147 [details] Patch for landing
(In reply to Jer Noble from comment #6) > View in context: > https://bugs.webkit.org/attachment.cgi?id=397135&action=review > > r=me with just a couple nits. > > > Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:185 > > -#if !HAVE(AVKIT) > > - return false; > > -#else > > +#if ENABLE(VIDEO_PRESENTATION_MODE) && !PLATFORM(WATCHOS) > > if (!_page || !_page->videoFullscreenManager()) > > return false; > > > > return _page->videoFullscreenManager()->hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModePictureInPicture); > > +#else > > + return false; > > Nit: I think it's safe to drop the "!PLATFORM(WATCHOS)" part of this if > statement. The manager should already handle that watchOS doesn't support > PiP. Right. It is removed. > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm:550 > > - IPhoneUserInterfaceSwizzler userInterfaceSwizzler; > > + TestWebKitAPI::IPhoneUserInterfaceSwizzler userInterfaceSwizzler; > > This shouldn't be needed after r260469. Correct.
Committed r260486: <https://trac.webkit.org/changeset/260486> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397147 [details].