Index: ppapi/cpp/var.h |
diff --git a/ppapi/cpp/var.h b/ppapi/cpp/var.h |
index 17bb0b84ab001a9f5123afc397c24037cd154cc6..a4dfb332f2c7b51158136f1668733c0260032db1 100644 |
--- a/ppapi/cpp/var.h |
+++ b/ppapi/cpp/var.h |
@@ -15,12 +15,6 @@ namespace pp { |
class Instance; |
-#ifndef PPAPI_VAR_REMOVE_SCRIPTING |
-namespace deprecated { |
-class ScriptableObject; |
-} |
-#endif |
- |
class Var { |
public: |
struct Null {}; // Special value passed to constructor to make NULL. |
@@ -100,37 +94,6 @@ class Var { |
// in debug mode, and return an empty string. |
std::string AsString() const; |
-#ifndef PPAPI_VAR_REMOVE_SCRIPTING |
- // Takes ownership of the given pointer. |
- Var(Instance* instance, deprecated::ScriptableObject* object); |
- |
- // This assumes the object is of type object. If it's not, it will assert in |
- // debug mode. If it is not an object or not a ScriptableObject type, returns |
- // NULL. |
- deprecated::ScriptableObject* AsScriptableObject() const; |
- |
- bool HasProperty(const Var& name, Var* exception = NULL) const; |
- bool HasMethod(const Var& name, Var* exception = NULL) const; |
- Var GetProperty(const Var& name, Var* exception = NULL) const; |
- void GetAllPropertyNames(std::vector<Var>* properties, |
- Var* exception = NULL) const; |
- void SetProperty(const Var& name, const Var& value, Var* exception = NULL); |
- void RemoveProperty(const Var& name, Var* exception = NULL); |
- Var Call(const Var& method_name, uint32_t argc, Var* argv, |
- Var* exception = NULL); |
- Var Construct(uint32_t argc, Var* argv, Var* exception = NULL) const; |
- |
- // Convenience functions for calling functions with small # of args. |
- Var Call(const Var& method_name, Var* exception = NULL); |
- Var Call(const Var& method_name, const Var& arg1, Var* exception = NULL); |
- Var Call(const Var& method_name, const Var& arg1, const Var& arg2, |
- Var* exception = NULL); |
- Var Call(const Var& method_name, const Var& arg1, const Var& arg2, |
- const Var& arg3, Var* exception = NULL); |
- Var Call(const Var& method_name, const Var& arg1, const Var& arg2, |
- const Var& arg3, const Var& arg4, Var* exception = NULL); |
-#endif // ifndef PPAPI_VAR_REMOVE_SCRIPTING |
- |
// Returns a const reference to the PP_Var managed by this Var object. |
const PP_Var& pp_var() const { |
return var_; |