Refactor PPAPI proxy resource handling to maintain which host they came from,...

ppapi/proxy/plugin_resource.h

 // 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.
 
 #ifndef PPAPI_PROXY_PLUGIN_RESOURCE_H_
 #define PPAPI_PROXY_PLUGIN_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_instance.h"
+#include "ppapi/proxy/host_resource.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 
 // If you inherit from resource, make sure you add the class name here.
 #define FOR_ALL_PLUGIN_RESOURCES(F)                   \
   F(Audio) \
   F(AudioConfig) \
   F(Buffer) \
   F(Font) \
   F(Graphics2D) \
   F(ImageData) \
+  F(MockResource) \
   F(PrivateFontFile) \
   F(URLLoader) \
   F(URLRequestInfo)\
   F(URLResponseInfo)
 
 namespace pp {
 namespace proxy {
 
 // Forward declaration of Resource classes.
 #define DECLARE_RESOURCE_CLASS(RESOURCE) class RESOURCE;
 FOR_ALL_PLUGIN_RESOURCES(DECLARE_RESOURCE_CLASS)
 #undef DECLARE_RESOURCE_CLASS
 
 class PluginResource {
  public:
-  PluginResource(PP_Instance instance);
+  PluginResource(const HostResource& resource);
   virtual ~PluginResource();
 
   // Returns NULL if the resource is invalid or is a different type.
   template<typename T> static T* GetAs(PP_Resource res) {
     PluginResource* resource =
         PluginResourceTracker::GetInstance()->GetResourceObject(res);
     return resource ? resource->Cast<T>() : NULL;
   }
 
   template <typename T> T* Cast() { return NULL; }
 
-  PP_Instance instance() const { return instance_; }
+  PP_Instance instance() const { return host_resource_.instance(); }
+
+  // Returns the host resource ID for sending to the host process.
+  const HostResource& host_resource() const {
+    return host_resource_;
+  }
 
  private:
   // Type-specific getters for individual resource types. These will return
   // NULL if the resource does not match the specified type. Used by the Cast()
   // function.
   #define DEFINE_TYPE_GETTER(RESOURCE)  \
     virtual RESOURCE* As##RESOURCE();
   FOR_ALL_PLUGIN_RESOURCES(DEFINE_TYPE_GETTER)
   #undef DEFINE_TYPE_GETTER
 
-  // Instance this resource is associated with.
-  PP_Instance instance_;
+  // The resource ID in the host that this object corresponds to. Inside the
+  // plugin we'll remap the resource IDs so we can have many host processes
+  // each independently generating resources (which may conflict) but the IDs
+  // in the plugin will all be unique.
+  HostResource host_resource_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginResource);
 };
 
 // Cast() specializations.
 #define DEFINE_RESOURCE_CAST(Type)                   \
   template <> inline Type* PluginResource::Cast<Type>() {  \
       return As##Type();                             \
   }
 FOR_ALL_PLUGIN_RESOURCES(DEFINE_RESOURCE_CAST)
 #undef DEFINE_RESOURCE_CAST
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PLUGIN_RESOURCE_H_