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

ppapi/cpp/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 "ppapi/cpp/var.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/cpp/common.h"
+#include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/dev/scriptable_object_deprecated.h"
 
 // Define equivalent to snprintf on Windows.
 #if defined(_MSC_VER)
 #  define snprintf sprintf_s
 #endif
 
@@ skipping 60 matching lines @@
     var_ = get_interface<PPB_Var_Deprecated>()->VarFromUtf8(
         Module::Get()->pp_module(),
         utf8_str.c_str(),
         static_cast<uint32_t>(utf8_str.size()));
   } else {
     var_.type = PP_VARTYPE_NULL;
   }
   needs_release_ = (var_.type == PP_VARTYPE_STRING);
 }
 
-Var::Var(ScriptableObject* object) {
+Var::Var(Instance* instance, ScriptableObject* object) {
   if (has_interface<PPB_Var_Deprecated>()) {
     var_ = get_interface<PPB_Var_Deprecated>()->CreateObject(
-        Module::Get()->pp_module(), object->GetClass(), object);
+        instance->pp_instance(), object->GetClass(), object);
     needs_release_ = true;
   } else {
     var_.type = PP_VARTYPE_NULL;
     needs_release_ = false;
   }
 }
 
 Var::Var(const Var& other) {
   var_ = other.var_;
   if (NeedsRefcounting(var_)) {
@@ skipping 264 matching lines @@
       str.append("...");
     }
     snprintf(buf, sizeof(buf), format, str.c_str());
   } else if (is_object()) {
     snprintf(buf, sizeof(buf), "Var<OBJECT>");
   }
   return buf;
 }
 
 }  // namespace pp