Changeset 263827 in webkit

Timestamp:

Jul 1, 2020, 5:43:38 PM (6 years ago)

Author:

Alan Coon

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

Location:

branches/safari-610.1.20-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• SwiftOverlay/Tests/WebKitTests.swift (modified) (1 diff)
• UIProcess/API/Cocoa/WebKitSwiftOverlay.swift (modified) (2 diffs)

branches/safari-610.1.20-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-01  Alan Coon  <alancoon@apple.com>
+
+        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  <james.savage@apple.com>
+
+            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  <alancoon@apple.com>
 

branches/safari-610.1.20-branch/Source/WebKit/SwiftOverlay/Tests/WebKitTests.swift

@@ -31 +31 @@
     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:)
     }

branches/safari-610.1.20-branch/Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift

@@ -37 +37 @@
 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))
     }
 
@@ -49 +49 @@
 
     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))
     }