First pass at making the proxy handle multiple renderers. This associates the...

ppapi/proxy/plugin_resource_tracker.h

Index: ppapi/proxy/plugin_resource_tracker.h
===================================================================
--- ppapi/proxy/plugin_resource_tracker.h	(revision 71670)
+++ ppapi/proxy/plugin_resource_tracker.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,6 +13,8 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 
+template<typename T> struct DefaultSingletonTraits;
+
 namespace pp {
 namespace proxy {
 
@@ -21,8 +23,8 @@
 
 class PluginResourceTracker {
  public:
-  PluginResourceTracker(PluginDispatcher* dispatcher);
-  ~PluginResourceTracker();
+  // Returns the global singleton resource tracker for the plugin.
+  static PluginResourceTracker* GetInstance();

[piman, 2011/01/20 00:26:23]

Isn't it a problem that there is only a global resource tracker, but PP_Resource
are scoped by the renderer, and so a PP_Resource from one could collide with a
PP_Resource from another one ?

[brettw, 2011/01/20 00:48:45]

Yes, we will unfortunately need the same type of ID renaming for resources as we
do for var IDs. I'm going to do that in a separate pass.

 
   // Returns the object associated with the given resource ID, or NULL if
   // there isn't one.
@@ -50,15 +52,20 @@
   //
   //   PP_Resource result;
   //   dispatcher->Send(new MyMessage(..., &result));
-  //   if (dispatcher->plugin_resource_tracker()->
+  //   if (PluginResourceTracker::GetInstance()->
   //           PreparePreviouslyTrackedResource(result))
   //     return result;
   //   ... create resource object ...
-  //   dispatcher->plugin_resource_tracker()->AddResource(result, object);
+  //   PluginResourceTracker::GetInstance()->AddResource(result, object);
   //   return result;
   bool PreparePreviouslyTrackedResource(PP_Resource resource);
 
  private:
+  friend struct DefaultSingletonTraits<PluginResourceTracker>;
+
+  PluginResourceTracker();
+  ~PluginResourceTracker();
+
   struct ResourceInfo {
     ResourceInfo();
     ResourceInfo(int ref_count, linked_ptr<PluginResource> r);
@@ -74,8 +81,10 @@
   void ReleasePluginResourceRef(const PP_Resource& var,
                                 bool notify_browser_on_release);
 
-  // Pointer to the dispatcher that owns us.
-  PluginDispatcher* dispatcher_;
+  // Sends a ReleaseResource message to the host corresponding to the given
+  // resource.
+  void SendReleaseResourceToHost(PP_Resource resource_id,
+                                 PluginResource* resource);
 
   typedef std::map<PP_Resource, ResourceInfo> ResourceMap;
   ResourceMap resource_map_;