LEFT | RIGHT |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
(...skipping 16 matching lines...) Expand all Loading... |
30 } | 30 } |
31 | 31 |
32 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src) | 32 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src) |
33 : jsEngine(src.jsEngine), | 33 : jsEngine(src.jsEngine), |
34 value(std::move(src.value)) | 34 value(std::move(src.value)) |
35 { | 35 { |
36 } | 36 } |
37 | 37 |
38 AdblockPlus::JsValue::~JsValue() | 38 AdblockPlus::JsValue::~JsValue() |
39 { | 39 { |
| 40 if (value) |
| 41 { |
| 42 value->Dispose(); |
| 43 value.reset(); |
| 44 } |
40 } | 45 } |
41 | 46 |
42 bool AdblockPlus::JsValue::IsUndefined() const | 47 bool AdblockPlus::JsValue::IsUndefined() const |
43 { | 48 { |
44 const JsContext context(jsEngine); | 49 const JsContext context(jsEngine); |
45 return UnwrapValue()->IsUndefined(); | 50 return UnwrapValue()->IsUndefined(); |
46 } | 51 } |
47 | 52 |
48 bool AdblockPlus::JsValue::IsNull() const | 53 bool AdblockPlus::JsValue::IsNull() const |
49 { | 54 { |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 const v8::TryCatch tryCatch; | 228 const v8::TryCatch tryCatch; |
224 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); | 229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); |
225 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), | 230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), |
226 argv.size() ? &argv.front() : 0); | 231 argv.size() ? &argv.front() : 0); |
227 | 232 |
228 if (tryCatch.HasCaught()) | 233 if (tryCatch.HasCaught()) |
229 throw JsError(tryCatch.Exception(), tryCatch.Message()); | 234 throw JsError(tryCatch.Exception(), tryCatch.Message()); |
230 | 235 |
231 return JsValuePtr(new JsValue(jsEngine, result)); | 236 return JsValuePtr(new JsValue(jsEngine, result)); |
232 } | 237 } |
| 238 |
| 239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValue& arg) const |
| 240 { |
| 241 const JsContext context(jsEngine); |
| 242 JsValueList params; |
| 243 params.push_back(JsValuePtr(new JsValue(arg.jsEngine, arg.UnwrapValue()))); |
| 244 return Call(params); |
| 245 } |
LEFT | RIGHT |