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

ppapi/proxy/plugin_var_serialization_rules.cc

 // 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/plugin_var_serialization_rules.h"
 
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 
 namespace pp {
@@ skipping 100 matching lines @@
 
   // Objects need special translations to get the IDs valid in the host.
   if (var.type == PP_VARTYPE_OBJECT)
     return var_tracker_->GetHostObject(var);
 
   if (var.type == PP_VARTYPE_STRING)
     *str_val = var_tracker_->GetString(var);
   return var;
 }
 
-void PluginVarSerializationRules::EndSendPassRef(const PP_Var& var) {
+void PluginVarSerializationRules::EndSendPassRef(const PP_Var& var,
+                                                 Dispatcher* dispatcher) {
   // See BeginSendPassRef for an example of why we release our ref here.
+  // The var we have in our inner class has been converted to a host object
+  // by BeginSendPassRef. This means it's not a normal var valid in the plugin,
+  // so we need to use the special ReleaseHostObject.
   if (var.type == PP_VARTYPE_OBJECT)
-    var_tracker_->Release(var);
+    var_tracker_->ReleaseHostObject(dispatcher, var);
 }
 
 void PluginVarSerializationRules::ReleaseObjectRef(const PP_Var& var) {
   var_tracker_->Release(var);
 }
 
 }  // namespace proxy
 }  // namespace pp