Changeset 87688 in webkit

Timestamp:

May 30, 2011 9:14:29 AM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-30 Anders Carlsson <​andersca@apple.com>

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnection.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-30  Anders Carlsson  <andersca@apple.com>
+
+        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  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

@@ -101 +101 @@
 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);
 }
 
@@ -117 +117 @@
     }
 
-    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);
 }