diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 19:13:12 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 19:13:12 +0000 |
commit | 014b1a58348f49581f00401af2530fdd039563f7 (patch) | |
tree | 45ab927384239b447df108e25122d64694438a52 /ppapi | |
parent | d8c3a46da9b82be3997d619f4f3d5dd32a8c69f3 (diff) | |
download | chromium_src-014b1a58348f49581f00401af2530fdd039563f7.zip chromium_src-014b1a58348f49581f00401af2530fdd039563f7.tar.gz chromium_src-014b1a58348f49581f00401af2530fdd039563f7.tar.bz2 |
Make the exception for ExecuteScript a regular Var instead of a VarPrivate.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/7097004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/cpp/private/instance_private.cc | 3 | ||||
-rw-r--r-- | ppapi/cpp/private/instance_private.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ppapi/cpp/private/instance_private.cc b/ppapi/cpp/private/instance_private.cc index 825d178..9bf8135 100644 --- a/ppapi/cpp/private/instance_private.cc +++ b/ppapi/cpp/private/instance_private.cc @@ -64,8 +64,7 @@ VarPrivate InstancePrivate::GetOwnerElementObject() { pp_instance())); } -VarPrivate InstancePrivate::ExecuteScript(const Var& script, - VarPrivate* exception) { +VarPrivate InstancePrivate::ExecuteScript(const Var& script, Var* exception) { if (!has_interface<PPB_Instance_Private>()) return VarPrivate(); return VarPrivate(Var::PassRef(), diff --git a/ppapi/cpp/private/instance_private.h b/ppapi/cpp/private/instance_private.h index 98b8315..2d7add8 100644 --- a/ppapi/cpp/private/instance_private.h +++ b/ppapi/cpp/private/instance_private.h @@ -45,7 +45,7 @@ class InstancePrivate : public Instance { VarPrivate GetOwnerElementObject(); /// See PPB_Instance.ExecuteScript. - VarPrivate ExecuteScript(const Var& script, VarPrivate* exception = NULL); + VarPrivate ExecuteScript(const Var& script, Var* exception = NULL); // @} }; |