Modified: branches/safari-610.1.20-branch/Source/WebKit/ChangeLog (263919 => 263920)
--- branches/safari-610.1.20-branch/Source/WebKit/ChangeLog 2020-07-04 00:12:24 UTC (rev 263919)
+++ branches/safari-610.1.20-branch/Source/WebKit/ChangeLog 2020-07-04 00:12:27 UTC (rev 263920)
@@ -1,5 +1,9 @@
2020-07-03 Kocsen Chung <[email protected]>
+ Revert r263781. rdar://problem/65085169
+
+2020-07-03 Kocsen Chung <[email protected]>
+
Revert r263793. rdar://problem/65085169
2020-07-02 Alan Coon <[email protected]>
Modified: branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (263919 => 263920)
--- branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-04 00:12:24 UTC (rev 263919)
+++ branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-04 00:12:27 UTC (rev 263920)
@@ -35,8 +35,8 @@
@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))
+ 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 createPDF(configuration: WKPDFConfiguration = .init(), completionHandler: @escaping (Result<Data, Error>) -> Void) {
@@ -47,8 +47,8 @@
__createWebArchiveData(completionHandler: makeResultHandler(completionHandler))
}
- 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))
+ public func evaluateJavaScript(_ _javascript_: String, in contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {
+ __evaluateJavaScript(_javascript_, in: contentWorld, completionHandler: completionHandler.map(makeResultHandler))
}
public func find(_ string: String, configuration: WKFindConfiguration = .init(), completionHandler: @escaping (WKFindResult) -> Void) {
