[webkit-changes] [263827] branches/safari-610.1.20-branch/Source/WebKit

Wed, 01 Jul 2020 17:45:08 -0700

Title: [263827] branches/safari-610.1.20-branch/Source/WebKit
Revision
263827
Author
[email protected]
Date
2020-07-01 17:43:38 -0700 (Wed, 01 Jul 2020)

Log Message

Cherry-pick r263793. rdar://problem/65011200

    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: https://svn.webkit.org/repository/webkit/trunk@263793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610.1.20-branch/Source/WebKit/ChangeLog (263826 => 263827)


--- branches/safari-610.1.20-branch/Source/WebKit/ChangeLog	2020-07-02 00:43:36 UTC (rev 263826)
+++ branches/safari-610.1.20-branch/Source/WebKit/ChangeLog	2020-07-02 00:43:38 UTC (rev 263827)
@@ -1,5 +1,37 @@
 2020-07-01  Alan Coon  <[email protected]>
 
+        Cherry-pick r263793. rdar://problem/65011200
+
+    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: https://svn.webkit.org/repository/webkit/trunk@263793 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-07-01  James Savage  <[email protected]>
+
+            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  Alan Coon  <[email protected]>
+
         Cherry-pick r263781. rdar://problem/65011200
 
     Fix Swift overlay build after r263727.

Modified: branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift (263826 => 263827)


--- branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift	2020-07-02 00:43:36 UTC (rev 263826)
+++ branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift	2020-07-02 00:43:38 UTC (rev 263827)
@@ -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:)
     }

Modified: branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (263826 => 263827)


--- branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift	2020-07-02 00:43:36 UTC (rev 263826)
+++ branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift	2020-07-02 00:43:38 UTC (rev 263827)
@@ -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) {

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to