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

ppapi/proxy/ppp_instance_proxy.cc

 // Copyright (c) 2010 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/ppp_instance_proxy.h"
 
 #include <algorithm>
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
@@ skipping 48 matching lines @@
   PP_Bool result = PP_FALSE;
   HostDispatcher::GetForInstance(instance)->Send(
       new PpapiMsg_PPPInstance_HandleInputEvent(INTERFACE_ID_PPP_INSTANCE,
                                                 instance, *event, &result));
   return result;
 }
 
 PP_Bool HandleDocumentLoad(PP_Instance instance,
                            PP_Resource url_loader) {
   PP_Bool result = PP_FALSE;
+  HostResource serialized_loader;
+  serialized_loader.SetHostResource(instance, url_loader);
   HostDispatcher::GetForInstance(instance)->Send(
       new PpapiMsg_PPPInstance_HandleDocumentLoad(INTERFACE_ID_PPP_INSTANCE,
-                                                  instance, url_loader,
+                                                  instance, serialized_loader,
                                                   &result));
   return result;
 }
 
 PP_Var GetInstanceObject(PP_Instance instance) {
   Dispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   ReceiveSerializedVarReturnValue result;
   dispatcher->Send(new PpapiMsg_PPPInstance_GetInstanceObject(
       INTERFACE_ID_PPP_INSTANCE, instance, &result));
   return result.Return(dispatcher);
@@ skipping 91 matching lines @@
   ppp_instance_target()->DidChangeFocus(instance, has_focus);
 }
 
 void PPP_Instance_Proxy::OnMsgHandleInputEvent(PP_Instance instance,
                                                const PP_InputEvent& event,
                                                PP_Bool* result) {
   *result = ppp_instance_target()->HandleInputEvent(instance, &event);
 }
 
 void PPP_Instance_Proxy::OnMsgHandleDocumentLoad(PP_Instance instance,
-                                                 PP_Resource url_loader,
+                                                 const HostResource& url_loader,
                                                  PP_Bool* result) {
-  PPB_URLLoader_Proxy::TrackPluginResource(instance, url_loader);
+  PP_Resource plugin_loader =
+      PPB_URLLoader_Proxy::TrackPluginResource(url_loader);
   *result = ppp_instance_target()->HandleDocumentLoad(
-      instance, url_loader);
+      instance, plugin_loader);
 }
 
 void PPP_Instance_Proxy::OnMsgGetInstanceObject(
     PP_Instance instance,
     SerializedVarReturnValue result) {
   result.Return(dispatcher(),
                 ppp_instance_target()->GetInstanceObject(instance));
 }
 
 }  // namespace proxy
 }  // namespace pp