Changeset 263826 in webkit

Timestamp:

Jul 1, 2020, 5:43:36 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r263781. rdar://problem/65011200

Fix Swift overlay build after r263727.
<rdar://problem/64962370> and ​https://bugs.webkit.org/show_bug.cgi?id=213823

Reviewed by Darin Adler.

No new tests (No behavior change).

Adapt the Swift overlay refinemnt to handle the inFrame: argument for these methods.

• UIProcess/API/Cocoa/WebKitSwiftOverlay.swift: (callAsyncJavaScript(_:arguments:in:in:completionHandler:Error:)): (evaluateJavaScript(_:in:in:completionHandler:Error:)): (callAsyncJavaScript(_:arguments:in:completionHandler:Error:)): Deleted. (evaluateJavaScript(_:in:completionHandler:Error:)): Deleted.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@263781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610.1.20-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (modified) (2 diffs)

branches/safari-610.1.20-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-01  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r263781. rdar://problem/65011200
+
+    Fix Swift overlay build after r263727.
+    <rdar://problem/64962370> and https://bugs.webkit.org/show_bug.cgi?id=213823
+    
+    Reviewed by Darin Adler.
+    
+    No new tests (No behavior change).
+    
+    Adapt the Swift overlay refinemnt to handle the inFrame: argument for these methods.
+    
+    * UIProcess/API/Cocoa/WebKitSwiftOverlay.swift:
+    (callAsyncJavaScript(_:arguments:in:in:completionHandler:Error:)):
+    (evaluateJavaScript(_:in:in:completionHandler:Error:)):
+    (callAsyncJavaScript(_:arguments:in:completionHandler:Error:)): Deleted.
+    (evaluateJavaScript(_:in:completionHandler:Error:)): Deleted.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-06-30  Brady Eidson  <beidson@apple.com>
+
+            Fix Swift overlay build after r263727.
+            <rdar://problem/64962370> and https://bugs.webkit.org/show_bug.cgi?id=213823
+
+            Reviewed by Darin Adler.
+
+            No new tests (No behavior change).
+
+            Adapt the Swift overlay refinemnt to handle the inFrame: argument for these methods.
+
+            * UIProcess/API/Cocoa/WebKitSwiftOverlay.swift:
+            (callAsyncJavaScript(_:arguments:in:in:completionHandler:Error:)):
+            (evaluateJavaScript(_:in:in:completionHandler:Error:)):
+            (callAsyncJavaScript(_:arguments:in:completionHandler:Error:)): Deleted.
+            (evaluateJavaScript(_:in:completionHandler:Error:)): Deleted.
+
 2020-06-29  Elliot  <CheeseEBoi@mailo.com>
 

branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift

@@ -36 +36 @@
 @available(iOS 14.0, macOS 10.16, *)
 extension WKWebView {
-    public func callAsyncJavaScript(_ functionBody: String, arguments: [String:Any] = [:], in contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {
-        __callAsyncJavaScript(functionBody, arguments: arguments, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
+    public func callAsyncJavaScript(_ functionBody: String, arguments: [String:Any] = [:], in frame: WKFrameInfo? = nil, in contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {
+        __callAsyncJavaScript(functionBody, arguments: arguments, in: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
     }
 
@@ -48 +48 @@
     }
 
-    public func evaluateJavaScript(_ javaScript: String, in contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {
-        __evaluateJavaScript(javaScript, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
+    public func evaluateJavaScript(_ javaScript: String, in frame: WKFrameInfo? = nil, in contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {
+        __evaluateJavaScript(javaScript, in: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
     }