Title: [147953] trunk/Source/WebKit2
- Revision
- 147953
- Author
- [email protected]
- Date
- 2013-04-08 14:31:52 -0700 (Mon, 08 Apr 2013)
Log Message
Web/Plugin process deadlock initializing async plugins.
<rdar://problem/13525232> and https://bugs.webkit.org/show_bug.cgi?id=114217
Reviewed by Anders Carlsson.
The "Async initialization complete" messages probably don't have to be synchronous.
* PluginProcess/WebProcessConnection.cpp:
(WebKit::WebProcessConnection::createPluginAsynchronously): Notify of initialization success/failure asynchronously.
* WebProcess/Plugins/PluginProxy.messages.in:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147952 => 147953)
--- trunk/Source/WebKit2/ChangeLog 2013-04-08 21:24:33 UTC (rev 147952)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-08 21:31:52 UTC (rev 147953)
@@ -1,3 +1,16 @@
+2013-04-08 Brady Eidson <[email protected]>
+
+ Web/Plugin process deadlock initializing async plugins.
+ <rdar://problem/13525232> and https://bugs.webkit.org/show_bug.cgi?id=114217
+
+ Reviewed by Anders Carlsson.
+
+ The "Async initialization complete" messages probably don't have to be synchronous.
+
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::createPluginAsynchronously): Notify of initialization success/failure asynchronously.
+ * WebProcess/Plugins/PluginProxy.messages.in:
+
2013-04-08 Anders Carlsson <[email protected]>
Add an async version of ResourceHandle::didReceiveResponse
Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (147952 => 147953)
--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2013-04-08 21:24:33 UTC (rev 147952)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2013-04-08 21:31:52 UTC (rev 147953)
@@ -292,11 +292,11 @@
// Otherwise, send the asynchronous results now.
if (!result) {
- m_connection->sendSync(Messages::PluginProxy::DidFailToCreatePlugin(), Messages::PluginProxy::DidFailToCreatePlugin::Reply(), creationParameters.pluginInstanceID);
+ m_connection->send(Messages::PluginProxy::DidFailToCreatePlugin(), creationParameters.pluginInstanceID);
return;
}
- m_connection->sendSync(Messages::PluginProxy::DidCreatePlugin(wantsWheelEvents, remoteLayerClientID), Messages::PluginProxy::DidCreatePlugin::Reply(), creationParameters.pluginInstanceID);
+ m_connection->send(Messages::PluginProxy::DidCreatePlugin(wantsWheelEvents, remoteLayerClientID), creationParameters.pluginInstanceID);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in (147952 => 147953)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2013-04-08 21:24:33 UTC (rev 147952)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2013-04-08 21:31:52 UTC (rev 147953)
@@ -76,10 +76,10 @@
#endif
# Tells the WebProcess that the plug-in was successfully initialized asynchronously
- DidCreatePlugin(bool wantsWheelEvents, uint32_t remoteLayerClientID) -> ()
+ DidCreatePlugin(bool wantsWheelEvents, uint32_t remoteLayerClientID)
# Tells the WebProcess that the plug-in failed to initialize.
- DidFailToCreatePlugin() -> ()
+ DidFailToCreatePlugin()
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
