From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 7 May 2012 11:21:11 +0200 Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286) --- Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp') diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp index 35da365d7..cebf4f7b2 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp @@ -87,8 +87,9 @@ PluginProcessProxy* PluginProcessManager::pluginProcessWithPath(const String& pl { for (size_t i = 0; i < m_pluginProcesses.size(); ++i) { if (m_pluginProcesses[i]->pluginInfo().path == pluginPath) - return m_pluginProcesses[i]; + return m_pluginProcesses[i].get(); } + return 0; } @@ -97,10 +98,12 @@ PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginM if (PluginProcessProxy* pluginProcess = pluginProcessWithPath(plugin.path)) return pluginProcess; - PluginProcessProxy* pluginProcess = PluginProcessProxy::create(this, plugin).leakPtr(); - m_pluginProcesses.append(pluginProcess); + RefPtr pluginProcess = PluginProcessProxy::create(this, plugin); + PluginProcessProxy* pluginProcessPtr = pluginProcess.get(); + + m_pluginProcesses.append(pluginProcess.release()); - return pluginProcess; + return pluginProcessPtr; } } // namespace WebKit -- cgit v1.2.1