| 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-2016 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 | 
| (...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::JsValue AdblockPlus::JsValue::Call(const JsValueList& params, JsVal
     uePtr 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->isolate, *jsEngine->context); | 217       jsEngine->isolate, *jsEngine->context); | 
| 218     thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); | 218     thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); | 
| 219   } | 219   } | 
| 220   if (!thisPtr->IsObject()) | 220   if (!thisPtr->IsObject()) | 
| 221     throw new std::runtime_error("`this` pointer has to be an object"); | 221     throw new std::runtime_error("`this` pointer has to be an object"); | 
| 222   v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapVal
     ue()); | 222   v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapVal
     ue()); | 
| 223 | 223 | 
| 224   std::vector<v8::Handle<v8::Value>> argv; | 224   std::vector<v8::Handle<v8::Value>> argv; | 
| 225   for (JsValueList::const_iterator it = params.begin(); it != params.end(); ++it
     ) | 225   for (JsValueList::const_iterator it = params.begin(); it != params.end(); ++it
     ) | 
| 226     argv.push_back((*it)->UnwrapValue()); | 226     argv.push_back((*it)->UnwrapValue()); | 
| 227 | 227 | 
| 228   const v8::TryCatch tryCatch; | 228   const v8::TryCatch tryCatch; | 
| 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 JsValue(jsEngine, result); | 
| 237 } | 237 } | 
| OLD | NEW | 
|---|