Track NPObject ownership by the originating plugins' NPP identifier. [4/6] (Chrome)

content/child/np_channel_base.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/np_channel_base.h"
 
 #include <stack>
 
 #include "base/auto_reset.h"
 #include "base/containers/hash_tables.h"
@@ skipping 54 matching lines @@
     iter->second->Send(new IPC::Message(*message));
   }
   delete message;
 }
 
 NPChannelBase::NPChannelBase()
     : mode_(IPC::Channel::MODE_NONE),
       non_npobject_count_(0),
       peer_pid_(0),
       in_remove_route_(false),
+      default_owner_(NULL),
       channel_valid_(false),
       in_unblock_dispatch_(0),
       send_unblocking_only_during_unblock_dispatch_(false) {
 }
 
 NPChannelBase::~NPChannelBase() {

[darin (slow to review), 2013/06/18 23:26:24]

should we assert that these new maps are empty at shutdown time?

[Wez, 2013/06/19 05:17:54]

Done.

 }
 
 NPChannelBase* NPChannelBase::GetCurrentChannel() {
   return g_lazy_channel_stack.Pointer()->top().get();
 }
 
 void NPChannelBase::CleanupChannels() {
   // Make a copy of the references as we can't iterate the map since items will
   // be removed from it as we clean them up.
   std::vector<scoped_refptr<NPChannelBase> > channels;
@@ skipping 173 matching lines @@
        iter != g_channels.Get().end(); ++iter) {
     if (iter->second.get() == this) {
       // Insert new element before invalidating |iter|.
       g_channels.Get()[iter->first + "-error"] = iter->second;
       g_channels.Get().erase(iter);
       break;
     }
   }
 }
 
-NPObject* NPChannelBase::GetExistingNPObjectProxy(int route_id) {
-  ProxyMap::iterator iter = proxy_map_.find(route_id);
-  return iter != proxy_map_.end() ? iter->second : NULL;
-}
-
-int NPChannelBase::GetExistingRouteForNPObjectStub(NPObject* npobject) {
-  StubMap::iterator iter = stub_map_.find(npobject);
-  return iter != stub_map_.end() ? iter->second : MSG_ROUTING_NONE;
-}
-
 void NPChannelBase::AddMappingForNPObjectProxy(int route_id,
                                                NPObject* object) {
   proxy_map_[route_id] = object;
 }
 
+void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) {
+  proxy_map_.erase(route_id);
+}
+
 void NPChannelBase::AddMappingForNPObjectStub(int route_id,
                                               NPObject* object) {
   DCHECK(object != NULL);
   stub_map_[object] = route_id;
 }
 
 void NPChannelBase::RemoveMappingForNPObjectStub(int route_id,
                                                  NPObject* object) {
   DCHECK(object != NULL);
   stub_map_.erase(object);
 }
 
-void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) {
-  proxy_map_.erase(route_id);
+void NPChannelBase::AddMappingForNPObjectOwner(int route_id,
+                                               struct _NPP* owner) {
+  DCHECK(owner != NULL);
+  route_to_owner_[route_id] = owner;
+  owner_to_route_[owner] = route_id;
+}
+
+void NPChannelBase::AddDefaultNPObjectOwner(struct _NPP* owner) {

[darin (slow to review), 2013/06/18 23:26:24]

nit: Since this method only supports retaining a single value, it'd perhaps be
better prefixed with "Set" instead of "Add"?

[Wez, 2013/06/19 05:17:54]

Done.

+  DCHECK(owner != NULL);
+  default_owner_ = owner;
+}
+
+void NPChannelBase::RemoveMappingForNPObjectOwner(int route_id) {
+  DCHECK(route_to_owner_.find(route_id) != route_to_owner_.end());
+  owner_to_route_.erase(route_to_owner_[route_id]);
+  route_to_owner_.erase(route_id);
+}
+
+NPObject* NPChannelBase::GetExistingNPObjectProxy(int route_id) {
+  ProxyMap::iterator iter = proxy_map_.find(route_id);
+  return iter != proxy_map_.end() ? iter->second : NULL;
+}
+
+int NPChannelBase::GetExistingRouteForNPObjectStub(NPObject* npobject) {
+  StubMap::iterator iter = stub_map_.find(npobject);
+  return iter != stub_map_.end() ? iter->second : MSG_ROUTING_NONE;
+}
+
+NPP NPChannelBase::GetExistingNPObjectOwner(int route_id) {
+  RouteToOwnerMap::iterator iter = route_to_owner_.find(route_id);
+  return iter != route_to_owner_.end() ? iter->second : default_owner_;
+}
+
+int NPChannelBase::GetExistingRouteForNPObjectOwner(NPP owner) {
+  OwnerToRouteMap::iterator iter = owner_to_route_.find(owner);
+  return iter != owner_to_route_.end() ? iter->second : MSG_ROUTING_NONE;
 }
 
 }  // namespace content