Fix Swift overlay build after r263727.
https://bugs.webkit.org/show_bug.cgi?id=213823.
Unreviewed, follow up build fix.
* SwiftOverlay/Tests/WebKitTests.swift:
(WebKitTests.testAPI): Fix tests to refer to new parameter name.
* UIProcess/API/Cocoa/WebKitSwiftOverlay.swift:
(callAsyncJavaScript(_:arguments:in:in:completionHandler:Error:)): Use
the imported ObjC name that the compiler expects.
(evaluateJavaScript(_:in:in:completionHandler:Error:)): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263793 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 599a847..f583812 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2020-07-01 James Savage <james.savage@apple.com>
+
+ Fix Swift overlay build after r263727.
+ https://bugs.webkit.org/show_bug.cgi?id=213823.
+
+ Unreviewed, follow up build fix.
+
+ * SwiftOverlay/Tests/WebKitTests.swift:
+ (WebKitTests.testAPI): Fix tests to refer to new parameter name.
+ * UIProcess/API/Cocoa/WebKitSwiftOverlay.swift:
+ (callAsyncJavaScript(_:arguments:in:in:completionHandler:Error:)): Use
+ the imported ObjC name that the compiler expects.
+ (evaluateJavaScript(_:in:in:completionHandler:Error:)): Ditto.
+
2020-07-01 Youenn Fablet <youenn@apple.com>
Make NetworkRTCProvider receive IPC messages from a background thread
diff --git a/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift b/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift
index 84b3060..705042c 100644
--- a/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift
+++ b/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift
@@ -30,10 +30,10 @@
/// This is a compile-time test that ensures the function names are what we expect.
func testAPI() {
_ = WKContentWorld.world(name:)
- _ = WKWebView.callAsyncJavaScript(_:arguments:in:completionHandler:)
+ _ = WKWebView.callAsyncJavaScript(_:arguments:in:in:completionHandler:)
_ = WKWebView.createPDF(configuration:completionHandler:)
_ = WKWebView.createWebArchiveData(completionHandler:)
- _ = WKWebView.evaluateJavaScript(_:in:completionHandler:)
+ _ = WKWebView.evaluateJavaScript(_:in:in:completionHandler:)
_ = WKWebView.find(_:configuration:completionHandler:)
}
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift b/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift
index d8cfad9..8763353 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift
+++ b/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift
@@ -36,7 +36,7 @@
@available(iOS 14.0, macOS 10.16, *)
extension WKWebView {
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))
+ __callAsyncJavaScript(functionBody, arguments: arguments, inFrame: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
}
public func createPDF(configuration: WKPDFConfiguration = .init(), completionHandler: @escaping (Result<Data, Error>) -> Void) {
@@ -48,7 +48,7 @@
}
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))
+ __evaluateJavaScript(javaScript, inFrame: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
}
public func find(_ string: String, configuration: WKFindConfiguration = .init(), completionHandler: @escaping (WKFindResult) -> Void) {
