Title: [87688] trunk/Source/WebKit2
- Revision
- 87688
- Author
- [email protected]
- Date
- 2011-05-30 09:14:29 -0700 (Mon, 30 May 2011)
Log Message
2011-05-30 Anders Carlsson <[email protected]>
Reviewed by Simon Fraser.
Remove incorrect asserts from PluginProcessConnection
https://bugs.webkit.org/show_bug.cgi?id=61731
There might be pending incoming messages from a PluginProxy even though we've
destroyed the plug-in and removed it from the m_plugins map, so remove the incorrect assertions.
* WebProcess/Plugins/PluginProcessConnection.cpp:
(WebKit::PluginProcessConnection::didReceiveMessage):
(WebKit::PluginProcessConnection::didReceiveSyncMessage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (87687 => 87688)
--- trunk/Source/WebKit2/ChangeLog 2011-05-30 15:44:02 UTC (rev 87687)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-30 16:14:29 UTC (rev 87688)
@@ -1,3 +1,17 @@
+2011-05-30 Anders Carlsson <[email protected]>
+
+ Reviewed by Simon Fraser.
+
+ Remove incorrect asserts from PluginProcessConnection
+ https://bugs.webkit.org/show_bug.cgi?id=61731
+
+ There might be pending incoming messages from a PluginProxy even though we've
+ destroyed the plug-in and removed it from the m_plugins map, so remove the incorrect assertions.
+
+ * WebProcess/Plugins/PluginProcessConnection.cpp:
+ (WebKit::PluginProcessConnection::didReceiveMessage):
+ (WebKit::PluginProcessConnection::didReceiveSyncMessage):
+
2011-05-30 Carlos Garcia Campos <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (87687 => 87688)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-05-30 15:44:02 UTC (rev 87687)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-05-30 16:14:29 UTC (rev 87688)
@@ -100,13 +100,13 @@
void PluginProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
- if (arguments->destinationID()) {
- if (PluginProxy* pluginProxy = m_plugins.get(arguments->destinationID()))
- pluginProxy->didReceivePluginProxyMessage(connection, messageID, arguments);
+ ASSERT(arguments->destinationID());
+
+ PluginProxy* pluginProxy = m_plugins.get(arguments->destinationID());
+ if (!pluginProxy)
return;
- }
- ASSERT_NOT_REACHED();
+ pluginProxy->didReceivePluginProxyMessage(connection, messageID, arguments);
}
void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, OwnPtr<CoreIPC::ArgumentEncoder>& reply)
@@ -116,12 +116,13 @@
return;
}
- if (PluginProxy* pluginProxy = m_plugins.get(arguments->destinationID())) {
- pluginProxy->didReceiveSyncPluginProxyMessage(connection, messageID, arguments, reply);
+ ASSERT(arguments->destinationID());
+
+ PluginProxy* pluginProxy = m_plugins.get(arguments->destinationID());
+ if (!pluginProxy)
return;
- }
- ASSERT_NOT_REACHED();
+ pluginProxy->didReceiveSyncPluginProxyMessage(connection, messageID, arguments, reply);
}
void PluginProcessConnection::didClose(CoreIPC::Connection*)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
