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

ppapi/proxy/ppb_instance_proxy.cc

-// 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.
 
 #include "ppapi/proxy/ppb_instance_proxy.h"
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_resource.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 PP_Var GetWindowObject(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
@@ skipping 15 matching lines @@
   dispatcher->Send(new PpapiHostMsg_PPBInstance_GetOwnerElementObject(
           INTERFACE_ID_PPB_INSTANCE, instance, &result));
   return result.Return(dispatcher);
 }
 
 PP_Bool BindGraphics(PP_Instance instance, PP_Resource device) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_FALSE;
 
+  PluginResource* object =
+      PluginResourceTracker::GetInstance()->GetResourceObject(device);
+  if (!object || object->instance() != instance)
+    return PP_FALSE;
+
   PP_Bool result = PP_FALSE;
   dispatcher->Send(new PpapiHostMsg_PPBInstance_BindGraphics(
-      INTERFACE_ID_PPB_INSTANCE, instance, device, &result));
+      INTERFACE_ID_PPB_INSTANCE, instance, object->host_resource(),
+      &result));
   return result;
 }
 
 PP_Bool IsFullFrame(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_FALSE;
 
   PP_Bool result = PP_FALSE;
   dispatcher->Send(new PpapiHostMsg_PPBInstance_IsFullFrame(
@@ skipping 69 matching lines @@
 }
 
 void PPB_Instance_Proxy::OnMsgGetOwnerElementObject(
     PP_Instance instance,
     SerializedVarReturnValue result) {
   result.Return(dispatcher(),
                 ppb_instance_target()->GetOwnerElementObject(instance));
 }
 
 void PPB_Instance_Proxy::OnMsgBindGraphics(PP_Instance instance,
-                                           PP_Resource device,
+                                           HostResource device,
                                            PP_Bool* result) {
-  *result = ppb_instance_target()->BindGraphics(instance, device);
+  *result = ppb_instance_target()->BindGraphics(instance,
+                                                device.host_resource());
 }
 
 void PPB_Instance_Proxy::OnMsgIsFullFrame(PP_Instance instance,
                                           PP_Bool* result) {
   *result = ppb_instance_target()->IsFullFrame(instance);
 }
 
 void PPB_Instance_Proxy::OnMsgExecuteScript(
     PP_Instance instance,
     SerializedVarReceiveInput script,
     SerializedVarOutParam out_exception,
     SerializedVarReturnValue result) {
   result.Return(dispatcher(), ppb_instance_target()->ExecuteScript(
       instance,
       script.Get(dispatcher()),
       out_exception.OutParam(dispatcher())));
 }
 
 }  // namespace proxy
 }  // namespace pp