| OLD | NEW |
| 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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 std::string AdblockPlus::JsValue::GetClass() const | 198 std::string AdblockPlus::JsValue::GetClass() const |
| 199 { | 199 { |
| 200 if (!IsObject()) | 200 if (!IsObject()) |
| 201 throw new std::runtime_error("Cannot get constructor of a non-object"); | 201 throw new std::runtime_error("Cannot get constructor of a non-object"); |
| 202 | 202 |
| 203 const JsContext context(jsEngine); | 203 const JsContext context(jsEngine); |
| 204 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue()); | 204 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue()); |
| 205 return Utils::FromV8String(obj->GetConstructorName()); | 205 return Utils::FromV8String(obj->GetConstructorName()); |
| 206 } | 206 } |
| 207 | 207 |
| 208 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValueList& params, Js
ValuePtr thisPtr) const | 208 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsConstValueList& param
s, JsValuePtr thisPtr) const |
| 209 { | 209 { |
| 210 if (!IsFunction()) | 210 if (!IsFunction()) |
| 211 throw new std::runtime_error("Attempting to call a non-function"); | 211 throw new std::runtime_error("Attempting to call a non-function"); |
| 212 | 212 |
| 213 const JsContext context(jsEngine); | 213 const JsContext context(jsEngine); |
| 214 if (!thisPtr) | 214 if (!thisPtr) |
| 215 { | 215 { |
| 216 v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New( | 216 v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New( |
| 217 jsEngine->GetIsolate(), *jsEngine->context); | 217 jsEngine->GetIsolate(), *jsEngine->context); |
| 218 thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); | 218 thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); | 229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); |
| 230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), | 230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), |
| 231 argv.size() ? &argv.front() : 0); | 231 argv.size() ? &argv.front() : 0); |
| 232 | 232 |
| 233 if (tryCatch.HasCaught()) | 233 if (tryCatch.HasCaught()) |
| 234 throw JsError(tryCatch.Exception(), tryCatch.Message()); | 234 throw JsError(tryCatch.Exception(), tryCatch.Message()); |
| 235 | 235 |
| 236 return JsValuePtr(new JsValue(jsEngine, result)); | 236 return JsValuePtr(new JsValue(jsEngine, result)); |
| 237 } | 237 } |
| 238 | 238 |
| 239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValue& arg) const | 239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsConstValuePtr& arg) c
onst |
| 240 { | 240 { |
| 241 const JsContext context(jsEngine); | 241 JsConstValueList params; |
| 242 JsValueList params; | 242 params.push_back(arg); |
| 243 params.push_back(JsValuePtr(new JsValue(arg.jsEngine, arg.UnwrapValue()))); | |
| 244 return Call(params); | 243 return Call(params); |
| 245 } | 244 } |
| OLD | NEW |