Title: [196774] trunk/Source/WebKit2
- Revision
- 196774
- Author
- [email protected]
- Date
- 2016-02-18 13:30:23 -0800 (Thu, 18 Feb 2016)
Log Message
RemoteInspector deadlocks if _WKAutomationDelegate creates/registers a target synchronously
https://bugs.webkit.org/show_bug.cgi?id=154359
<rdar://problem/24708897>
Reviewed by Joseph Pecoraro.
* UIProcess/Cocoa/AutomationClient.mm:
(WebKit::AutomationClient::requestAutomationSession):
Make an NSString out of the String reference so it gets captured correctly.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (196773 => 196774)
--- trunk/Source/WebKit2/ChangeLog 2016-02-18 20:59:26 UTC (rev 196773)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-18 21:30:23 UTC (rev 196774)
@@ -1,3 +1,15 @@
+2016-02-18 Brian Burg <[email protected]>
+
+ RemoteInspector deadlocks if _WKAutomationDelegate creates/registers a target synchronously
+ https://bugs.webkit.org/show_bug.cgi?id=154359
+ <rdar://problem/24708897>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UIProcess/Cocoa/AutomationClient.mm:
+ (WebKit::AutomationClient::requestAutomationSession):
+ Make an NSString out of the String reference so it gets captured correctly.
+
2016-02-18 Brady Eidson <[email protected]>
Modern IDB: Implement client->server operations in WK2.
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/AutomationClient.mm (196773 => 196774)
--- trunk/Source/WebKit2/UIProcess/Cocoa/AutomationClient.mm 2016-02-18 20:59:26 UTC (rev 196773)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/AutomationClient.mm 2016-02-18 21:30:23 UTC (rev 196774)
@@ -72,9 +72,11 @@
// Force clients to create and register a session asynchronously. Otherwise,
// RemoteInspector will try to acquire its lock to register the new session and
// deadlock because it's already taken while handling XPC messages.
+
+ NSString *retainedIdentifier = sessionIdentifier;
dispatch_async(dispatch_get_main_queue(), ^{
if (m_delegateMethods.requestAutomationSession)
- [m_delegate.get() _processPool:m_processPool didRequestAutomationSessionWithIdentifier:sessionIdentifier];
+ [m_delegate.get() _processPool:m_processPool didRequestAutomationSessionWithIdentifier:retainedIdentifier];
});
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
