Add an instance parameter to var objects, audio, and the 2D API. This replaces the module in most cases.

This will be used in the proxy to multiplex one plugin across multiple renderer processes. We need the instance in the proxy to know which process to send it to.

I added a deprecated var object creation function for native client, which
depends on the module and this is very difficult to change. Because it doesn't
have the multiplexing requirements, this is fine for now.

TEST=ppapi ui tests
BUG=none
Review URL: http://codereview.chromium.org/6085009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70721 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/ppapi/cpp/var.h b/ppapi/cpp/var.h
index 9109fef..0fdd5f5 100644
--- a/ppapi/cpp/var.h
+++ b/ppapi/cpp/var.h
@@ -8,10 +8,13 @@
 #include <string>
 #include <vector>
 
+#include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_var.h"
 
 namespace pp {
 
+class Instance;
+
 namespace deprecated {
 class ScriptableObject;
 }
@@ -49,7 +52,14 @@ class Var {
   }
 
   // Takes ownership of the given pointer.
-  Var(deprecated::ScriptableObject* object);
+  Var(Instance* instance, deprecated::ScriptableObject* object);
+
+  // TODO(brettw) erase this! This is a temporary hack to keep the build
+  // going while we land the nacl side of this change. Calling this function
+  // will crash rather than break the compile.
+  Var(deprecated::ScriptableObject* /* object */) {
+    *(int*)0 = 3;
+  }
 
   Var(const Var& other);