| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/cpp/private/instance_private.h" | 5 #include "ppapi/cpp/private/instance_private.h" |
| 6 | 6 |
| 7 #include "ppapi/c/private/ppb_instance_private.h" | 7 #include "ppapi/c/private/ppb_instance_private.h" |
| 8 #include "ppapi/c/private/ppp_instance_private.h" | 8 #include "ppapi/c/private/ppp_instance_private.h" |
| 9 #include "ppapi/cpp/module_impl.h" | 9 #include "ppapi/cpp/module_impl.h" |
| 10 #include "ppapi/cpp/private/var_private.h" | 10 #include "ppapi/cpp/private/var_private.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 } | 57 } |
| 58 | 58 |
| 59 VarPrivate InstancePrivate::GetOwnerElementObject() { | 59 VarPrivate InstancePrivate::GetOwnerElementObject() { |
| 60 if (!has_interface<PPB_Instance_Private>()) | 60 if (!has_interface<PPB_Instance_Private>()) |
| 61 return VarPrivate(); | 61 return VarPrivate(); |
| 62 return VarPrivate(Var::PassRef(), | 62 return VarPrivate(Var::PassRef(), |
| 63 get_interface<PPB_Instance_Private>()->GetOwnerElementObject( | 63 get_interface<PPB_Instance_Private>()->GetOwnerElementObject( |
| 64 pp_instance())); | 64 pp_instance())); |
| 65 } | 65 } |
| 66 | 66 |
| 67 VarPrivate InstancePrivate::ExecuteScript(const Var& script, | 67 VarPrivate InstancePrivate::ExecuteScript(const Var& script, Var* exception) { |
| 68 VarPrivate* exception) { | |
| 69 if (!has_interface<PPB_Instance_Private>()) | 68 if (!has_interface<PPB_Instance_Private>()) |
| 70 return VarPrivate(); | 69 return VarPrivate(); |
| 71 return VarPrivate(Var::PassRef(), | 70 return VarPrivate(Var::PassRef(), |
| 72 get_interface<PPB_Instance_Private>()->ExecuteScript( | 71 get_interface<PPB_Instance_Private>()->ExecuteScript( |
| 73 pp_instance(), | 72 pp_instance(), |
| 74 script.pp_var(), | 73 script.pp_var(), |
| 75 VarPrivate::OutException(exception).get())); | 74 VarPrivate::OutException(exception).get())); |
| 76 } | 75 } |
| 77 | 76 |
| 78 } // namespace pp | 77 } // namespace pp |
| OLD | NEW |