Modified: branches/safari-610.1.20-branch/Source/WebKit/ChangeLog (263825 => 263826)
--- branches/safari-610.1.20-branch/Source/WebKit/ChangeLog 2020-07-02 00:32:08 UTC (rev 263825)
+++ branches/safari-610.1.20-branch/Source/WebKit/ChangeLog 2020-07-02 00:43:36 UTC (rev 263826)
@@ -1,3 +1,42 @@
+2020-07-01 Alan Coon <[email protected]>
+
+ Cherry-pick r263781. rdar://problem/65011200
+
+ 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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-06-30 Brady Eidson <[email protected]>
+
+ 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-29 Elliot <[email protected]>
[GTK] Dark mode for GTK themes that end with -Dark
Modified: branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (263825 => 263826)
--- branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-02 00:32:08 UTC (rev 263825)
+++ branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift 2020-07-02 00:43:36 UTC (rev 263826)
@@ -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) {
