Changeset 71081 in webkit

Timestamp:

Nov 1, 2010 5:12:48 PM (13 years ago)

Author:

andersca@apple.com

Message:

Make NPRemoteObjectMap a ref counted object
​https://bugs.webkit.org/show_bug.cgi?id=48808

Reviewed by Oliver Hunt.

• PluginProcess/PluginControllerProxy.cpp:

(WebKit::PluginControllerProxy::windowScriptNPObject):

• PluginProcess/WebProcessConnection.cpp:

(WebKit::WebProcessConnection::WebProcessConnection):
(WebKit::WebProcessConnection::didReceiveSyncMessage):

• PluginProcess/WebProcessConnection.h:

(WebKit::WebProcessConnection::npRemoteObjectMap):

• Shared/Plugins/NPRemoteObjectMap.cpp:

(WebKit::NPRemoteObjectMap::create):
(WebKit::NPRemoteObjectMap::~NPRemoteObjectMap):
(WebKit::NPRemoteObjectMap::createNPObjectProxy):

• Shared/Plugins/NPRemoteObjectMap.h:
• WebProcess/Plugins/PluginProcessConnection.cpp:

(WebKit::PluginProcessConnection::PluginProcessConnection):
(WebKit::PluginProcessConnection::didReceiveSyncMessage):

• WebProcess/Plugins/PluginProcessConnection.h:

(WebKit::PluginProcessConnection::npRemoteObjectMap):

• WebProcess/Plugins/PluginProxy.cpp:

(WebKit::PluginProxy::getWindowScriptNPObject):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (2 diffs)
• PluginProcess/WebProcessConnection.cpp (modified) (3 diffs)
• PluginProcess/WebProcessConnection.h (modified) (4 diffs)
• Shared/Plugins/NPRemoteObjectMap.cpp (modified) (2 diffs)
• Shared/Plugins/NPRemoteObjectMap.h (modified) (3 diffs)
• WebProcess/Plugins/PluginProcessConnection.cpp (modified) (3 diffs)
• WebProcess/Plugins/PluginProcessConnection.h (modified) (4 diffs)
• WebProcess/Plugins/PluginProxy.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-11-01  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Make NPRemoteObjectMap a ref counted object
+        https://bugs.webkit.org/show_bug.cgi?id=48808
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::windowScriptNPObject):
+        * PluginProcess/WebProcessConnection.cpp:
+        (WebKit::WebProcessConnection::WebProcessConnection):
+        (WebKit::WebProcessConnection::didReceiveSyncMessage):
+        * PluginProcess/WebProcessConnection.h:
+        (WebKit::WebProcessConnection::npRemoteObjectMap):
+        * Shared/Plugins/NPRemoteObjectMap.cpp:
+        (WebKit::NPRemoteObjectMap::create):
+        (WebKit::NPRemoteObjectMap::~NPRemoteObjectMap):
+        (WebKit::NPRemoteObjectMap::createNPObjectProxy):
+        * Shared/Plugins/NPRemoteObjectMap.h:
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::PluginProcessConnection::PluginProcessConnection):
+        (WebKit::PluginProcessConnection::didReceiveSyncMessage):
+        * WebProcess/Plugins/PluginProcessConnection.h:
+        (WebKit::PluginProcessConnection::npRemoteObjectMap):
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::getWindowScriptNPObject):
+
 2010-11-01  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -30 +30 @@
 #include "BackingStore.h"
 #include "DataReference.h"
-#include "NPObjectProxy.h"
+#include "NPRemoteObjectMap.h"
 #include "NetscapePlugin.h"
 #include "NotImplemented.h"
@@ -171 +171 @@
         return 0;
 
-    return m_connection->npRemoteObjectMap().createNPObjectProxy(windowScriptNPObjectID);
+    return m_connection->npRemoteObjectMap()->createNPObjectProxy(windowScriptNPObjectID);
 }
 

trunk/WebKit2/PluginProcess/WebProcessConnection.cpp

@@ -28 +28 @@
 #include "WebProcessConnection.h"
 
+#include "NPRemoteObjectMap.h"
 #include "PluginControllerProxy.h"
 #include "PluginProcess.h"
@@ -45 +46 @@
     
 WebProcessConnection::WebProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier)
-    : m_connection(CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main()))
-    , m_npRemoteObjectMap(m_connection.get())
 {
+    m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+    m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
+
     m_connection->open();
 }
@@ -106 +108 @@
 
     if (messageID.is<CoreIPC::MessageClassNPObjectMessageReceiver>())
-        return m_npRemoteObjectMap.didReceiveSyncMessage(connection, messageID, arguments, reply);
+        return m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, arguments, reply);
 
     if (PluginControllerProxy* pluginControllerProxy = m_pluginControllers.get(destinationID))

trunk/WebKit2/PluginProcess/WebProcessConnection.h

@@ -30 +30 @@
 
 #include "Connection.h"
-#include "NPRemoteObjectMap.h"
 #include "Plugin.h"
 #include <wtf/RefCounted.h>
@@ -36 +35 @@
 namespace WebKit {
 
+class NPRemoteObjectMap;
 class PluginControllerProxy;
     
@@ -47 +47 @@
     CoreIPC::Connection* connection() const { return m_connection.get(); }
 
-    NPRemoteObjectMap& npRemoteObjectMap() { return m_npRemoteObjectMap; }
+    NPRemoteObjectMap* npRemoteObjectMap() const { return m_npRemoteObjectMap.get(); }
 
 private:
@@ -71 +71 @@
 
     HashMap<uint64_t, PluginControllerProxy*> m_pluginControllers;
-    NPRemoteObjectMap m_npRemoteObjectMap;
+    RefPtr<NPRemoteObjectMap> m_npRemoteObjectMap;
 };
 

trunk/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp

@@ -39 +39 @@
     return ++generateNPObjectID;
 }
-    
+
+PassRefPtr<NPRemoteObjectMap> NPRemoteObjectMap::create(CoreIPC::Connection* connection)
+{
+    return adoptRef(new NPRemoteObjectMap(connection));
+}
+
 NPRemoteObjectMap::NPRemoteObjectMap(CoreIPC::Connection* connection)
     : m_connection(connection)
@@ -45 +50 @@
 }
 
-NPObjectProxy* NPRemoteObjectMap::createNPObjectProxy(uint64_t remoteObjectID)
+NPRemoteObjectMap::~NPRemoteObjectMap()
+{
+}
+
+NPObject* NPRemoteObjectMap::createNPObjectProxy(uint64_t remoteObjectID)
 {
     return NPObjectProxy::create(this, remoteObjectID);

trunk/WebKit2/Shared/Plugins/NPRemoteObjectMap.h

@@ -32 +32 @@
 #include <WebCore/npruntime.h>
 #include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
+#include <wtf/RefCounted.h>
 
 namespace WebKit {
@@ -39 +39 @@
 class NPObjectProxy;
 
-class NPRemoteObjectMap {
-    WTF_MAKE_NONCOPYABLE(NPRemoteObjectMap);
-
+class NPRemoteObjectMap : public RefCounted<NPRemoteObjectMap> {
 public:
-    explicit NPRemoteObjectMap(CoreIPC::Connection*);
+    static PassRefPtr<NPRemoteObjectMap> create(CoreIPC::Connection*);
+    ~NPRemoteObjectMap();
 
     // Creates an NPObjectProxy wrapper for the remote object with the given remote object ID.
-    NPObjectProxy* createNPObjectProxy(uint64_t remoteObjectID);
+    NPObject* createNPObjectProxy(uint64_t remoteObjectID);
 
     // Expose the given NPObject as a remote object. Returns the objectID.
@@ -56 +55 @@
 
 private:
+    explicit NPRemoteObjectMap(CoreIPC::Connection*);
     CoreIPC::Connection* m_connection;
 

trunk/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

@@ -28 +28 @@
 #include "PluginProcessConnection.h"
 
+#include "NPRemoteObjectMap.h"
 #include "PluginProcessConnectionManager.h"
 #include "PluginProxy.h"
@@ -37 +38 @@
     : m_pluginProcessConnectionManager(pluginProcessConnectionManager)
     , m_pluginPath(pluginPath)
-    , m_connection(CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop()))
-    , m_npRemoteObjectMap(m_connection.get())
 {
+    m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop());
+    m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
+
     m_connection->open();
 }
@@ -84 +86 @@
 {
     if (messageID.is<CoreIPC::MessageClassNPObjectMessageReceiver>())
-        return m_npRemoteObjectMap.didReceiveSyncMessage(connection, messageID, arguments, reply);
+        return m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, arguments, reply);
 
     if (PluginProxy* pluginProxy = m_plugins.get(arguments->destinationID()))

trunk/WebKit2/WebProcess/Plugins/PluginProcessConnection.h

@@ -30 +30 @@
 
 #include "Connection.h"
-#include "NPRemoteObjectMap.h"
 #include "Plugin.h"
 #include <wtf/RefCounted.h>
@@ -39 +38 @@
 namespace WebKit {
 
+class NPRemoteObjectMap;
 class PluginProcessConnectionManager;
 class PluginProxy;
@@ -57 +57 @@
     void removePluginProxy(PluginProxy*);
 
-    NPRemoteObjectMap& npRemoteObjectMap() { return m_npRemoteObjectMap; }
+    NPRemoteObjectMap* npRemoteObjectMap() const { return m_npRemoteObjectMap.get(); }
 
 private:
@@ -77 +77 @@
     HashMap<uint64_t, PluginProxy*> m_plugins;
 
-    NPRemoteObjectMap m_npRemoteObjectMap;
+    RefPtr<NPRemoteObjectMap> m_npRemoteObjectMap;
 };
 

trunk/WebKit2/WebProcess/Plugins/PluginProxy.cpp

@@ -30 +30 @@
 #include "BackingStore.h"
 #include "DataReference.h"
+#include "NPRemoteObjectMap.h"
 #include "NPRuntimeUtilities.h"
 #include "NotImplemented.h"
@@ -355 +356 @@
     }
 
-    windowScriptNPObjectID = m_connection->npRemoteObjectMap().registerNPObject(windowScriptNPObject);
+    windowScriptNPObjectID = m_connection->npRemoteObjectMap()->registerNPObject(windowScriptNPObject);
     releaseNPObject(windowScriptNPObject);
 }