Modified: branches/safari-610.1.20-branch/Source/WebKit/ChangeLog (263918 => 263919)
--- branches/safari-610.1.20-branch/Source/WebKit/ChangeLog 2020-07-03 23:56:31 UTC (rev 263918)
+++ branches/safari-610.1.20-branch/Source/WebKit/ChangeLog 2020-07-04 00:12:24 UTC (rev 263919)
@@ -1,3 +1,7 @@
+2020-07-03 Kocsen Chung <[email protected]>
+
+ Revert r263793. rdar://problem/65085169
+
2020-07-02 Alan Coon <[email protected]>
Cherry-pick r263854. rdar://problem/65048370
Modified: branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift (263918 => 263919)
--- branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift 2020-07-03 23:56:31 UTC (rev 263918)
+++ branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift 2020-07-04 00:12:24 UTC (rev 263919)
@@ -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:in:completionHandler:)
+ _ = WKWebView.callAsyncJavaScript(_:arguments:in:completionHandler:)
_ = WKWebView.createPDF(configuration:completionHandler:)
_ = WKWebView.createWebArchiveData(completionHandler:)
- _ = WKWebView.evaluateJavaScript(_:in:in:completionHandler:)
+ _ = WKWebView.evaluateJavaScript(_:in:completionHandler:)
_ = WKWebView.find(_:configuration:completionHandler:)
}
Modified: branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (263918 => 263919)
--- branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-03 23:56:31 UTC (rev 263918)
+++ branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-04 00:12:24 UTC (rev 263919)
@@ -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, inFrame: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
+ __callAsyncJavaScript(functionBody, arguments: arguments, in: 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_, inFrame: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
+ __evaluateJavaScript(_javascript_, in: frame, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
}
public func find(_ string: String, configuration: WKFindConfiguration = .init(), completionHandler: @escaping (WKFindResult) -> Void) {
