Changeset 263781 in webkit

Timestamp:

Jun 30, 2020, 6:08:40 PM (6 years ago)

Author:

beidson@apple.com

Message:

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.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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-30  Brady Eidson  <beidson@apple.com>
 

trunk/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))
     }