| 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-2015 Eyeo GmbH | 3  * Copyright (C) 2006-2015 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  * | 
| 14  * You should have received a copy of the GNU General Public License | 14  * You should have received a copy of the GNU General Public License | 
| 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
| 16  */ | 16  */ | 
| 17 | 17 | 
| 18 #include <vector> | 18 #include <vector> | 
| 19 #include <AdblockPlus.h> | 19 #include <AdblockPlus.h> | 
| 20 | 20 | 
| 21 #include "JsContext.h" | 21 #include "JsContext.h" | 
| 22 #include "JsError.h" | 22 #include "JsError.h" | 
| 23 #include "Utils.h" | 23 #include "Utils.h" | 
| 24 | 24 | 
| 25 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine, | 25 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine, | 
| 26       v8::Handle<v8::Value> value) | 26       v8::Handle<v8::Value> value) | 
| 27     : jsEngine(jsEngine), | 27     : jsEngine(jsEngine), | 
| 28       value(new v8::Persistent<v8::Value>(jsEngine->isolate, value)) | 28       value(new v8::UniquePersistent<v8::Value>(jsEngine->isolate, value)) | 
| 29 { | 29 { | 
| 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() | 
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 180 | 180 | 
| 181 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValuePtr
     & val) | 181 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValuePtr
     & val) | 
| 182 { | 182 { | 
| 183   const JsContext context(jsEngine); | 183   const JsContext context(jsEngine); | 
| 184   SetProperty(name, val->UnwrapValue()); | 184   SetProperty(name, val->UnwrapValue()); | 
| 185 } | 185 } | 
| 186 | 186 | 
| 187 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val) | 187 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val) | 
| 188 { | 188 { | 
| 189   const JsContext context(jsEngine); | 189   const JsContext context(jsEngine); | 
| 190   SetProperty(name, v8::Boolean::New(val)); | 190   SetProperty(name, v8::Boolean::New(jsEngine->isolate, val)); | 
| 191 } | 191 } | 
| 192 | 192 | 
| 193 std::string AdblockPlus::JsValue::GetClass() const | 193 std::string AdblockPlus::JsValue::GetClass() const | 
| 194 { | 194 { | 
| 195   if (!IsObject()) | 195   if (!IsObject()) | 
| 196     throw new std::runtime_error("Cannot get constructor of a non-object"); | 196     throw new std::runtime_error("Cannot get constructor of a non-object"); | 
| 197 | 197 | 
| 198   const JsContext context(jsEngine); | 198   const JsContext context(jsEngine); | 
| 199   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue()); | 199   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue()); | 
| 200   return Utils::FromV8String(obj->GetConstructorName()); | 200   return Utils::FromV8String(obj->GetConstructorName()); | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 223   const v8::TryCatch tryCatch; | 223   const v8::TryCatch tryCatch; | 
| 224   v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); | 224   v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); | 
| 225   v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), | 225   v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), | 
| 226       argv.size() ? &argv.front() : 0); | 226       argv.size() ? &argv.front() : 0); | 
| 227 | 227 | 
| 228   if (tryCatch.HasCaught()) | 228   if (tryCatch.HasCaught()) | 
| 229     throw JsError(tryCatch.Exception(), tryCatch.Message()); | 229     throw JsError(tryCatch.Exception(), tryCatch.Message()); | 
| 230 | 230 | 
| 231   return JsValuePtr(new JsValue(jsEngine, result)); | 231   return JsValuePtr(new JsValue(jsEngine, result)); | 
| 232 } | 232 } | 
| OLD | NEW | 
|---|