Changeset 149259 in webkit

Timestamp:

Apr 28, 2013 11:17:18 AM (11 years ago)

Author:

andersca@apple.com

Message:

Use OwnPtr<PluginControllerProxy> for storing plug-in controllers in WebProcessConnection
​https://bugs.webkit.org/show_bug.cgi?id=115259

Reviewed by Andreas Kling.

• PluginProcess/WebProcessConnection.cpp:

(WebKit::WebProcessConnection::addPluginControllerProxy):
(WebKit::WebProcessConnection::removePluginControllerProxy):
(WebKit::WebProcessConnection::didClose):

• PluginProcess/WebProcessConnection.h:

(WebProcessConnection):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/WebProcessConnection.cpp (modified) (3 diffs)
• PluginProcess/WebProcessConnection.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-26  Anders Carlsson  <andersca@apple.com>
+
+        Use OwnPtr<PluginControllerProxy> for storing plug-in controllers in WebProcessConnection
+        https://bugs.webkit.org/show_bug.cgi?id=115259
+
+        Reviewed by Andreas Kling.
+
+        * PluginProcess/WebProcessConnection.cpp:
+        (WebKit::WebProcessConnection::addPluginControllerProxy):
+        (WebKit::WebProcessConnection::removePluginControllerProxy):
+        (WebKit::WebProcessConnection::didClose):
+        * PluginProcess/WebProcessConnection.h:
+        (WebProcessConnection):
+
 2013-04-27  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

@@ -72 +72 @@
 
     ASSERT(!m_pluginControllers.contains(pluginInstanceID));
-    m_pluginControllers.set(pluginInstanceID, pluginController.leakPtr());
+    m_pluginControllers.set(pluginInstanceID, pluginController);
 }
 
@@ -87 +87 @@
         ASSERT(m_pluginControllers.contains(pluginController->pluginInstanceID()));
 
-        OwnPtr<PluginControllerProxy> pluginControllerOwnPtr = adoptPtr(m_pluginControllers.take(pluginController->pluginInstanceID()));
+        OwnPtr<PluginControllerProxy> pluginControllerOwnPtr = m_pluginControllers.take(pluginController->pluginInstanceID());
         ASSERT(pluginControllerOwnPtr == pluginController);
     }
@@ -168 +168 @@
     // will cause the web process connection itself to be destroyed.
     Vector<PluginControllerProxy*> pluginControllers;
-    copyValuesToVector(m_pluginControllers, pluginControllers);
+    for (auto& pluginController: m_pluginControllers.values())
+        pluginControllers.append(pluginController.get());
 
     for (size_t i = 0; i < pluginControllers.size(); ++i)

trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h

@@ -79 +79 @@
     RefPtr<CoreIPC::Connection> m_connection;
 
-    HashMap<uint64_t, PluginControllerProxy*> m_pluginControllers;
+    HashMap<uint64_t, OwnPtr<PluginControllerProxy>> m_pluginControllers;
     RefPtr<NPRemoteObjectMap> m_npRemoteObjectMap;
     HashSet<uint64_t> m_asynchronousInstanceIDsToIgnore;