Convert resources to take an instance key instead of an Instance*.

ppapi/cpp/instance.h

 // Copyright (c) 2012 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.
 
 #ifndef PPAPI_CPP_INSTANCE_H_
 #define PPAPI_CPP_INSTANCE_H_
 
 /// @file
 /// This file defines the C++ wrapper for an instance.
 
 #include <map>
 #include <string>
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/view.h"
 
 struct PP_InputEvent;
 
 /// The C++ interface to the Pepper API.
 namespace pp {
 
 class Graphics2D;
 class Graphics3D;
 class InputEvent;
+class InstanceHandle;
 class Rect;
 class URLLoader;
 class Var;
 
 class Instance {
  public:
   /// Default constructor. Construction of an instance should only be done in
   /// response to a browser request in <code>Module::CreateInstance</code>.
   /// Otherwise, the instance will lack the proper bookkeeping in the browser
   /// and in the C++ wrapper.
@@ skipping 16 matching lines @@
   /// file writes from this destructor since they will be immediately canceled.
   ///
   /// <strong>Note:</strong> This function may be skipped in certain
   /// call so the instance can perform cleanup-related tasks. Once this function
   /// returns, the <code>PP_Instance</code> handle will be invalid. This means
   /// that you can't do any asynchronous operations such as network requests or
   /// file writes from this destructor since they will be immediately canceled.
   virtual ~Instance();
 
   /// This function returns the <code>PP_Instance</code> identifying this
-  /// object. When using the PPAPI C++ wrappers this is not normally necessary,
-  /// but is required when using the lower-level C APIs.
+  /// object.
   ///
   /// @return A <code>PP_Instance</code> identifying this object.
   PP_Instance pp_instance() const { return pp_instance_; }
 
   /// Init() initializes this instance with the provided arguments. This
   /// function will be called immediately after the instance object is
   /// constructed.
   ///
   /// @param[in] argc The number of arguments contained in <code>argn</code>
   /// and <code>argv</code>.
@@ skipping 404 matching lines @@
   /// get the C calls in the first place.
   ///
   /// Refer to RemovePerInstanceObject() and GetPerInstanceObject() for further
   /// information.
   ///
   /// @param[in] interface_name The name of the interface to associate with the
   /// instance
   /// @param[in] object
   void AddPerInstanceObject(const std::string& interface_name, void* object);
 
-  // {PENDING: summarize Remove method here}
+  /// Static version of AddPerInstanceObject that takes an InstanceHandle. As with

[dmichael (off chromium), 2012/02/21 23:38:02]

nit: >80 char

+  /// all other instance functions, this must only be called on the main thread.
+  static void AddPerInstanceObject(const InstanceHandle& instance,
+                                   const std::string& interface_name,
+                                   void* object);
+
+  /// {PENDING: summarize Remove method here}

[dmichael (off chromium), 2012/02/21 23:38:02]

nit: jond made that // instead of /// to keep it out of the generated doxygen

   ///
   /// Refer to AddPerInstanceObject() for further information.
   ///
   /// @param[in] interface_name The name of the interface to associate with the
   /// instance
   /// @param[in] object
   void RemovePerInstanceObject(const std::string& interface_name, void* object);
 
+  /// Static version of AddPerInstanceObject that takes an InstanceHandle. As with
+  /// all other instance functions, this must only be called on the main thread.
+  static void RemovePerInstanceObject(const InstanceHandle& instance,
+                                      const std::string& interface_name,
+                                      void* object);
+
   /// Look up an object previously associated with an instance. Returns NULL
   /// if the instance is invalid or there is no object for the given interface
   /// name on the instance.
   ///
   /// Refer to AddPerInstanceObject() for further information.
   ///
   /// @param[in] instance
   /// @param[in] interface_name The name of the interface to associate with the
   /// instance.
   static void* GetPerInstanceObject(PP_Instance instance,
                                     const std::string& interface_name);
 
  private:
   PP_Instance pp_instance_;
 
   typedef std::map<std::string, void*> InterfaceNameToObjectMap;
   InterfaceNameToObjectMap interface_name_to_objects_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_INSTANCE_H_