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

ppapi/cpp/var.h

 // 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.
 
 #ifndef PPAPI_CPP_VAR_H_
 #define PPAPI_CPP_VAR_H_
 
 #include <string>
 #include <vector>
 
+#include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_var.h"
 
 namespace pp {
 
+class Instance;
+
 namespace deprecated {
 class ScriptableObject;
 }
 
 class Var {
  public:
   struct Null {};  // Special value passed to constructor to make NULL.
 
   Var();  // PP_Var of type Undefined.
   Var(Null);  // PP_Var of type Null.
@@ skipping 17 matching lines @@
   // argument from somewhere and that reference is managing the reference
   // count for us. The object will not be AddRef'ed or Release'd by this
   // class instance..
   struct DontManage {};
   Var(DontManage, PP_Var var) {
     var_ = var;
     needs_release_ = false;
   }
 
   // Takes ownership of the given pointer.
-  Var(deprecated::ScriptableObject* object);
+  Var(Instance* instance, deprecated::ScriptableObject* object);
 
   Var(const Var& other);
 
   virtual ~Var();
 
   Var& operator=(const Var& other);
 
   bool operator==(const Var& other) const;
 
   bool is_undefined() const { return var_.type == PP_VARTYPE_UNDEFINED; }
@@ skipping 133 matching lines @@
   // get a compilation error.
   Var(void* non_scriptable_object_pointer);
 
   PP_Var var_;
   bool needs_release_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_VAR_H_