diff --git a/src/WebKit/Enums.cs b/src/WebKit/Enums.cs index 11603b6d249e..ea8904a06fb6 100644 --- a/src/WebKit/Enums.cs +++ b/src/WebKit/Enums.cs @@ -14,7 +14,8 @@ public enum DomCssRuleType : ushort { Page = 6, Variables = 7, WebKitKeyFrames = 8, - WebKitKeyFrame = 9 + WebKitKeyFrame = 9, + NamespaceRule = 10, } public enum DomCssValueType : ushort { diff --git a/src/appkit.cs b/src/appkit.cs index 347d5802babb..4a8d00f00818 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -11969,7 +11969,7 @@ partial interface NSRulerView { bool IsFlipped { get; } //Detected properties - [Export ("scrollView")] + [Export ("scrollView", ArgumentSemantic.Weak)] NSScrollView ScrollView { get; set; } [Export ("orientation")] @@ -11990,7 +11990,7 @@ partial interface NSRulerView { [Export ("originOffset")] nfloat OriginOffset { get; set; } - [Export ("clientView")] + [Export ("clientView", ArgumentSemantic.Weak)] NSView ClientView { get; set; } [Export ("markers", ArgumentSemantic.Copy), NullAllowed] diff --git a/src/safariservices.cs b/src/safariservices.cs index 5c8b6be10606..66cc5d49eae9 100644 --- a/src/safariservices.cs +++ b/src/safariservices.cs @@ -18,6 +18,8 @@ #endif namespace XamCore.SafariServices { + delegate void SFExtensionValidationHandler (bool shouldHide, NSString text); + [Mac (10,12, onlyOn64: true)][iOS (10,0)] [BaseType (typeof(NSObject))] interface SFContentBlockerState @@ -128,6 +130,11 @@ interface SFSafariApplication [Static] [Export ("showPreferencesForExtensionWithIdentifier:completionHandler:")] void ShowPreferencesForExtension (string identifier, [NullAllowed] Action completionHandler); + + [Mac (10, 12, 4)] + [Static][Async] + [Export ("dispatchMessageWithName:toExtensionWithIdentifier:userInfo:completionHandler:")] + void DispatchMessage (string messageName, string identifier, [NullAllowed] NSDictionary userInfo, [NullAllowed] Action completionHandler); } [Mac (10,12, onlyOn64 : true)] @@ -171,6 +178,14 @@ interface SFSafariExtensionHandling [Export ("popoverViewController")] SFSafariExtensionViewController PopoverViewController { get; } + + [Mac (10, 12, 4)] + [Async (ResultTypeName="SFExtensionValidationResult")][Export ("validateContextMenuItemWithCommand:inPage:userInfo:validationHandler:")] + void ValidateContextMenuItem (string command, SFSafariPage page, [NullAllowed] NSDictionary userInfo, SFExtensionValidationHandler validationHandler); + + [Mac (10, 12, 4)] + [Export ("messageReceivedFromContainingAppWithName:userInfo:")] + void MessageReceivedFromContainingApp (string messageName, [NullAllowed] NSDictionary userInfo); } [Mac (10,12, onlyOn64: true)] @@ -215,6 +230,18 @@ interface SFSafariToolbarItem { [Export ("setEnabled:withBadgeText:")] void SetEnabled (bool enabled, [NullAllowed] string badgeText); + + [Mac (10, 12, 4)] + [Export ("setEnabled:")] + void SetEnabled (bool enabled); + + [Mac (10, 12, 4)] + [Export ("setBadgeText:")] + void SetBadgeText ([NullAllowed] string badgeText); + + [Mac (10, 12, 4)] + [Export ("setImage:")] + void SetImage ([NullAllowed] NSImage image); } [Mac (10,12, onlyOn64: true)]