Add an instance parameter to var objects, audio, and the 2D API. This replace...

webkit/plugins/ppapi/var.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 "webkit/plugins/ppapi/var.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 582 matching lines @@
                             const PPP_Class_Deprecated* ppp_class,
                             void** ppp_class_data) {
   scoped_refptr<ObjectVar> object(ObjectVar::FromPPVar(var));
   if (!object)
     return false;  // Not an object at all.
 
   return PluginObject::IsInstanceOf(object->np_object(),
                                     ppp_class, ppp_class_data);
 }
 
-PP_Var CreateObjectDeprecated(PP_Module module_id,
+PP_Var CreateObjectDeprecated(PP_Instance instance_id,
                               const PPP_Class_Deprecated* ppp_class,
                               void* ppp_class_data) {
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
+  if (!instance) {
+    DLOG(ERROR) << "Create object passed an invalid instance.";
+    return PP_MakeNull();
+  }
+  return PluginObject::Create(instance->module(), ppp_class, ppp_class_data);
+}
+
+PP_Var CreateObjectWithModuleDeprecated(PP_Module module_id,
+                                        const PPP_Class_Deprecated* ppp_class,
+                                        void* ppp_class_data) {
   PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
   if (!module)
     return PP_MakeNull();
   return PluginObject::Create(module, ppp_class, ppp_class_data);
 }
 
 const PPB_Var_Deprecated var_deprecated_interface = {
   &Var::PluginAddRefPPVar,
   &Var::PluginReleasePPVar,
   &VarFromUtf8,
   &VarToUtf8,
   &HasPropertyDeprecated,
   &HasMethodDeprecated,
   &GetProperty,
   &EnumerateProperties,
   &SetPropertyDeprecated,
   &DeletePropertyDeprecated,
   &CallDeprecated,
   &Construct,
   &IsInstanceOfDeprecated,
-  &CreateObjectDeprecated
+  &CreateObjectDeprecated,
+  &CreateObjectWithModuleDeprecated,
 };
 
 const PPB_Var var_interface = {
   &Var::PluginAddRefPPVar,
   &Var::PluginReleasePPVar,
   &VarFromUtf8,
   &VarToUtf8,
   &ConvertType,
   &DefineProperty,
   &HasProperty,
@@ skipping 226 matching lines @@
 }
 
 // static
 void TryCatch::Catch(void* self, const char* message) {
   static_cast<TryCatch*>(self)->SetException(message);
 }
 
 }  // namespace ppapi
 }  // namespace webkit