diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp index ef931c8..3d007a6 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp @@ -62,13 +62,14 @@ void PluginProcessConnection::removePluginProxy(PluginProxy* plugin) ASSERT(m_plugins.contains(plugin->pluginInstanceID())); m_plugins.remove(plugin->pluginInstanceID()); + // Invalidate all objects related to this plug-in. + m_npRemoteObjectMap->pluginDestroyed(plugin); + if (!m_plugins.isEmpty()) return; - // Invalidate our remote object map. - m_npRemoteObjectMap->invalidate(); - m_npRemoteObjectMap = 0; - + m_npRemoteObjectMap = nullptr; + // We have no more plug-ins, invalidate the connection to the plug-in process. ASSERT(m_connection); m_connection->invalidate(); |