Changeset 230675 in webkit

Timestamp:

Apr 16, 2018 11:53:50 AM (6 years ago)

Author:

BJ Burg

Message:

[Cocoa] Web Automation: add SPI to terminate automation session and disconnect the remote end
​https://bugs.webkit.org/show_bug.cgi?id=184523
<rdar://problem/39368599>

Reviewed by Simon Fraser.

When a user breaks the automation glass pane and chooses "Stop Session", there is no way
for Safari to actually disconnect the remote connection using automation-related ObjC SPI.
This can lead to sessions getting stuck and safaridriver is unable to request a new session.

Expose the -terminate method as SPI. This disconnects the remote connection and then notifies
the session delegate that the remote disconnected. At that point, Safari can uninstall
the session from the process pool and tear down other session state.

• UIProcess/API/Cocoa/_WKAutomationSession.h:
• UIProcess/API/Cocoa/_WKAutomationSession.mm:

(-[_WKAutomationSession terminate]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKAutomationSession.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKAutomationSession.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-16  Brian Burg  <bburg@apple.com>
+
+        [Cocoa] Web Automation: add SPI to terminate automation session and disconnect the remote end
+        https://bugs.webkit.org/show_bug.cgi?id=184523
+        <rdar://problem/39368599>
+
+        Reviewed by Simon Fraser.
+
+        When a user breaks the automation glass pane and chooses "Stop Session", there is no way
+        for Safari to actually disconnect the remote connection using automation-related ObjC SPI.
+        This can lead to sessions getting stuck and safaridriver is unable to request a new session.
+
+        Expose the -terminate method as SPI. This disconnects the remote connection and then notifies
+        the session delegate that the remote disconnected. At that point, Safari can uninstall
+        the session from the process pool and tear down other session state.
+
+        * UIProcess/API/Cocoa/_WKAutomationSession.h:
+        * UIProcess/API/Cocoa/_WKAutomationSession.mm:
+        (-[_WKAutomationSession terminate]):
+
 2018-04-16  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSession.h

@@ -48 +48 @@
 - (instancetype)initWithConfiguration:(_WKAutomationSessionConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
 
+- (void)terminate WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+
 #if !TARGET_OS_IPHONE
 - (BOOL)wasEventSynthesizedForAutomation:(NSEvent *)event;

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSession.mm

@@ -103 +103 @@
 }
 
+- (void)terminate
+{
+    _session->terminate();
+}
+
 #if PLATFORM(MAC)
 - (BOOL)wasEventSynthesizedForAutomation:(NSEvent *)event