Modified: trunk/Source/WebKit/ChangeLog (263780 => 263781)
--- trunk/Source/WebKit/ChangeLog 2020-07-01 01:06:46 UTC (rev 263780)
+++ trunk/Source/WebKit/ChangeLog 2020-07-01 01:08:40 UTC (rev 263781)
@@ -1,5 +1,22 @@
2020-06-30 Brady Eidson <beid...@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 <beid...@apple.com>
+
App-bound _javascript_ and Navigation failures should have specific error codes.
<rdar://problem/64940268> and https://bugs.webkit.org/show_bug.cgi?id=213808
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (263780 => 263781)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-01 01:06:46 UTC (rev 263780)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-01 01:08:40 UTC (rev 263781)
@@ -35,8 +35,8 @@
@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))
}
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 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))
}
public func find(_ string: String, configuration: WKFindConfiguration = .init(), completionHandler: @escaping (WKFindResult) -> Void) {
