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.

Sign up for GitHub

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

[WebKit] Implement Xcode 16.2 beta 1-3 changes. #21733

Merged
merged 2 commits into from
Dec 2, 2024
Merged

[WebKit] Implement Xcode 16.2 beta 1-3 changes. #21733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e2dab8
[WebKit] Implement Xcode 16.2 beta 1-3 changes.
rolfbjarne Dec 2, 2024
92eea1b
Auto-format source code
Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 46 additions & 3 deletions src/webkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5563,7 +5563,7 @@ interface WKWebView
[Export ("stopLoading:")]
void StopLoading ([NullAllowed] NSObject sender);

[Mac (15, 0), NoiOS, MacCatalyst (18, 0)]
[Mac (15, 0), iOS (18, 2), MacCatalyst (18, 0)]
[Export ("writingToolsActive")]
bool WritingToolsActive { [Bind ("isWritingToolsActive")] get; }
}
Expand Down Expand Up @@ -5690,11 +5690,11 @@ interface WKWebViewConfiguration : NSCopying, NSSecureCoding {
[Export ("userInterfaceDirectionPolicy", ArgumentSemantic.Assign)]
WKUserInterfaceDirectionPolicy UserInterfaceDirectionPolicy { get; set; }

[Mac (15, 0), NoiOS, MacCatalyst (18, 0)]
[Mac (15, 0), iOS (18, 2), MacCatalyst (18, 0)]
[Export ("supportsAdaptiveImageGlyph")]
bool SupportsAdaptiveImageGlyph { get; set; }

[Mac (15, 0), NoiOS, MacCatalyst (18, 0)]
[Mac (15, 0), iOS (18, 2), MacCatalyst (18, 0)]
[Export ("writingToolsBehavior")]
#if MONOMAC
NSWritingToolsBehavior WritingToolsBehavior { get; set; }
Expand Down Expand Up @@ -5830,6 +5830,10 @@ interface WKWebpagePreferences {
[Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0), NoWatch, NoTV]
[Export ("lockdownModeEnabled")]
bool LockdownModeEnabled { [Bind ("isLockdownModeEnabled")] get; set; }

[Mac (15, 2), iOS (18, 2), MacCatalyst (18, 2)]
[Export ("preferredHTTPSNavigationPolicy", ArgumentSemantic.Assign)]
WKWebpagePreferencesUpgradeToHttpsPolicy PreferredHttpsNavigationPolicy { get; set; }
}

[NoMac]
Expand Down Expand Up @@ -5934,6 +5938,8 @@ enum WKMediaPlaybackState : ulong {

interface IWKDownloadDelegate { }

delegate void WKDownloadDelegateDecidePlaceholderPolicyCallback (WKDownloadPlaceholderPolicy policy, [NullAllowed] NSUrl url);

[iOS (14, 5)]
[MacCatalyst (14, 5)]
#if NET
Expand All @@ -5959,6 +5965,18 @@ interface WKDownloadDelegate {

[Export ("download:didFailWithError:resumeData:")]
void DidFail (WKDownload download, NSError error, [NullAllowed] NSData resumeData);

[iOS (18, 2), MacCatalyst (18, 2), Mac (15, 2)]
[Export ("download:decidePlaceholderPolicy:")]
void DecidePlaceholderPolicy (WKDownload download, WKDownloadDelegateDecidePlaceholderPolicyCallback completionHandler);

[iOS (18, 2), MacCatalyst (18, 2), Mac (15, 2)]
[Export ("download:didReceivePlaceholderURL:completionHandler:")]
void DidReceivePlaceholderUrl (WKDownload download, NSUrl url, Action completionHandler);

[iOS (18, 2), MacCatalyst (18, 2), Mac (15, 2)]
[Export ("download:didReceiveFinalURL:")]
void DidReceiveFinalUrl (WKDownload download, NSUrl url);
}

[iOS (14, 5)]
Expand All @@ -5983,5 +6001,30 @@ interface WKDownload : NSProgressReporting {
[Async]
[Export ("cancel:")]
void Cancel ([NullAllowed] Action<NSData> completionHandler);

[Mac (15, 2), iOS (18, 2), MacCatalyst (18, 2)]
[Export ("userInitiated")]
bool UserInitiated { [Bind ("isUserInitiated")] get; }

[Mac (15, 2), iOS (18, 2), MacCatalyst (18, 2)]
[Export ("originatingFrame")]
WKFrameInfo OriginatingFrame { get; }

}

[iOS (18, 2), MacCatalyst (18, 2), Mac (15, 2)]
[Native]
public enum WKDownloadPlaceholderPolicy : long {
Disable,
Enable,
}

[Mac (15, 2), iOS (18, 2), MacCatalyst (18, 2)]
[Native ("WKWebpagePreferencesUpgradeToHTTPSPolicy")]
public enum WKWebpagePreferencesUpgradeToHttpsPolicy : long {
KeepAsRequested,
AutomaticFallbackToHttp,
UserMediatedFallbackToHttp,
ErrorOnFailure,
}
}
20 changes: 20 additions & 0 deletions tests/cecil-tests/Documentation.KnownFailures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21800,6 +21800,8 @@ F:WebKit.WKDataDetectorTypes.TrackingNumber
F:WebKit.WKDialogResult.AskAgain
F:WebKit.WKDialogResult.Handled
F:WebKit.WKDialogResult.ShowDefault
F:WebKit.WKDownloadPlaceholderPolicy.Disable
F:WebKit.WKDownloadPlaceholderPolicy.Enable
F:WebKit.WKDownloadRedirectPolicy.Allow
F:WebKit.WKDownloadRedirectPolicy.Cancel
F:WebKit.WKErrorCode.AttributedStringContentFailedToLoad
Expand Down Expand Up @@ -21858,6 +21860,10 @@ F:WebKit.WKUserInterfaceDirectionPolicy.Content
F:WebKit.WKUserInterfaceDirectionPolicy.System
F:WebKit.WKUserScriptInjectionTime.AtDocumentEnd
F:WebKit.WKUserScriptInjectionTime.AtDocumentStart
F:WebKit.WKWebpagePreferencesUpgradeToHttpsPolicy.AutomaticFallbackToHttp
F:WebKit.WKWebpagePreferencesUpgradeToHttpsPolicy.ErrorOnFailure
F:WebKit.WKWebpagePreferencesUpgradeToHttpsPolicy.KeepAsRequested
F:WebKit.WKWebpagePreferencesUpgradeToHttpsPolicy.UserMediatedFallbackToHttp
M:Accelerate.vImage.BoxConvolveARGB8888(Accelerate.vImageBuffer@,Accelerate.vImageBuffer@,System.IntPtr,System.IntPtr,System.IntPtr,System.UInt32,System.UInt32,Accelerate.Pixel8888,Accelerate.vImageFlags)
M:Accelerate.vImage.BoxConvolveARGB8888(Accelerate.vImageBuffer@,Accelerate.vImageBuffer@,System.IntPtr,System.IntPtr,System.IntPtr,System.UInt32,System.UInt32,Accelerate.Pixel8888*,Accelerate.vImageFlags)
M:Accelerate.vImage.BoxConvolvePlanar8(Accelerate.vImageBuffer@,Accelerate.vImageBuffer@,System.IntPtr,System.IntPtr,System.IntPtr,System.UInt32,System.UInt32,System.Byte,Accelerate.vImageFlags)
Expand Down Expand Up @@ -47757,9 +47763,12 @@ M:WebKit.IWebUIDelegate.UIValidateUserInterfaceItem(WebKit.WebView,Foundation.NS
M:WebKit.IWebUIDelegate.UIWillPerformDragDestination(WebKit.WebView,WebKit.WebDragDestinationAction,AppKit.INSDraggingInfo)
M:WebKit.IWebUIDelegate.UIWillPerformDragSource(WebKit.WebView,WebKit.WebDragSourceAction,CoreGraphics.CGPoint,AppKit.NSPasteboard)
M:WebKit.IWKDownloadDelegate.DecideDestination(WebKit.WKDownload,Foundation.NSUrlResponse,System.String,System.Action{Foundation.NSUrl})
M:WebKit.IWKDownloadDelegate.DecidePlaceholderPolicy(WebKit.WKDownload,WebKit.WKDownloadDelegateDecidePlaceholderPolicyCallback)
M:WebKit.IWKDownloadDelegate.DidFail(WebKit.WKDownload,Foundation.NSError,Foundation.NSData)
M:WebKit.IWKDownloadDelegate.DidFinish(WebKit.WKDownload)
M:WebKit.IWKDownloadDelegate.DidReceiveAuthenticationChallenge(WebKit.WKDownload,Foundation.NSUrlAuthenticationChallenge,System.Action{Foundation.NSUrlSessionAuthChallengeDisposition,Foundation.NSUrlCredential})
M:WebKit.IWKDownloadDelegate.DidReceiveFinalUrl(WebKit.WKDownload,Foundation.NSUrl)
M:WebKit.IWKDownloadDelegate.DidReceivePlaceholderUrl(WebKit.WKDownload,Foundation.NSUrl,System.Action)
M:WebKit.IWKDownloadDelegate.WillPerformHttpRedirection(WebKit.WKDownload,Foundation.NSHttpUrlResponse,Foundation.NSUrlRequest,System.Action{WebKit.WKDownloadRedirectPolicy})
M:WebKit.IWKHttpCookieStoreObserver.CookiesDidChangeInCookieStore(WebKit.WKHttpCookieStore)
M:WebKit.IWKNavigationDelegate.ContentProcessDidTerminate(WebKit.WKWebView)
Expand Down Expand Up @@ -48028,10 +48037,16 @@ M:WebKit.WKContentRuleListStore.LookUpContentRuleListAsync(System.String)
M:WebKit.WKContentRuleListStore.RemoveContentRuleListAsync(System.String)
M:WebKit.WKDownload.CancelAsync
M:WebKit.WKDownload.Dispose(System.Boolean)
M:WebKit.WKDownloadDelegate_Extensions.DecidePlaceholderPolicy(WebKit.IWKDownloadDelegate,WebKit.WKDownload,WebKit.WKDownloadDelegateDecidePlaceholderPolicyCallback)
M:WebKit.WKDownloadDelegate_Extensions.DidFail(WebKit.IWKDownloadDelegate,WebKit.WKDownload,Foundation.NSError,Foundation.NSData)
M:WebKit.WKDownloadDelegate_Extensions.DidFinish(WebKit.IWKDownloadDelegate,WebKit.WKDownload)
M:WebKit.WKDownloadDelegate_Extensions.DidReceiveAuthenticationChallenge(WebKit.IWKDownloadDelegate,WebKit.WKDownload,Foundation.NSUrlAuthenticationChallenge,System.Action{Foundation.NSUrlSessionAuthChallengeDisposition,Foundation.NSUrlCredential})
M:WebKit.WKDownloadDelegate_Extensions.DidReceiveFinalUrl(WebKit.IWKDownloadDelegate,WebKit.WKDownload,Foundation.NSUrl)
M:WebKit.WKDownloadDelegate_Extensions.DidReceivePlaceholderUrl(WebKit.IWKDownloadDelegate,WebKit.WKDownload,Foundation.NSUrl,System.Action)
M:WebKit.WKDownloadDelegate_Extensions.WillPerformHttpRedirection(WebKit.IWKDownloadDelegate,WebKit.WKDownload,Foundation.NSHttpUrlResponse,Foundation.NSUrlRequest,System.Action{WebKit.WKDownloadRedirectPolicy})
M:WebKit.WKDownloadDelegate.DecidePlaceholderPolicy(WebKit.WKDownload,WebKit.WKDownloadDelegateDecidePlaceholderPolicyCallback)
M:WebKit.WKDownloadDelegate.DidReceiveFinalUrl(WebKit.WKDownload,Foundation.NSUrl)
M:WebKit.WKDownloadDelegate.DidReceivePlaceholderUrl(WebKit.WKDownload,Foundation.NSUrl,System.Action)
M:WebKit.WKFindConfiguration.Copy(Foundation.NSZone)
M:WebKit.WKFindResult.Copy(Foundation.NSZone)
M:WebKit.WKFrameInfo.Copy(Foundation.NSZone)
Expand Down Expand Up @@ -69757,6 +69772,7 @@ P:WebKit.WebViewStatusTextEventArgs.Text
P:WebKit.WebViewToolBarsEventArgs.Visible
P:WebKit.WKDownload.Delegate
P:WebKit.WKDownload.Progress
P:WebKit.WKDownload.UserInitiated
P:WebKit.WKFrameInfo.MainFrame
P:WebKit.WKNavigationResponse.IsForMainFrame
P:WebKit.WKPreferences.ElementFullscreenEnabled
Expand All @@ -69769,6 +69785,7 @@ P:WebKit.WKPreviewActionItemIdentifier.Open
P:WebKit.WKPreviewActionItemIdentifier.Share
P:WebKit.WKUserScript.IsForMainFrameOnly
P:WebKit.WKWebpagePreferences.LockdownModeEnabled
P:WebKit.WKWebpagePreferences.PreferredHttpsNavigationPolicy
P:WebKit.WKWebsiteDataStore.Persistent
P:WebKit.WKWebsiteDataType.Cookies
P:WebKit.WKWebsiteDataType.DiskCache
Expand Down Expand Up @@ -76682,6 +76699,8 @@ T:WebKit.WKContentMode
T:WebKit.WKCookiePolicy
T:WebKit.WKDialogResult
T:WebKit.WKDownloadDelegate
T:WebKit.WKDownloadDelegateDecidePlaceholderPolicyCallback
T:WebKit.WKDownloadPlaceholderPolicy
T:WebKit.WKDownloadRedirectPolicy
T:WebKit.WKFullscreenState
T:WebKit.WKInactiveSchedulingPolicy
Expand All @@ -76690,3 +76709,4 @@ T:WebKit.WKMediaCaptureType
T:WebKit.WKMediaPlaybackState
T:WebKit.WKPermissionDecision
T:WebKit.WKUserInterfaceDirectionPolicy
T:WebKit.WKWebpagePreferencesUpgradeToHttpsPolicy
9 changes: 0 additions & 9 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-WebKit.todo
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-WebKit.todo
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions tests/xtro-sharpie/api-annotations-dotnet/macOS-WebKit.todo
View file
Open in desktop

This file was deleted.