| 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-present eyeo GmbH | 3  * Copyright (C) 2006-present 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 "JsError.h" | 18 #include "JsError.h" | 
| 19 | 19 | 
| 20 using namespace AdblockPlus; | 20 using namespace AdblockPlus; | 
| 21 | 21 | 
| 22 JsError::JsError(const v8::Local<v8::Value>& exception, | 22 JsError::JsError(v8::Isolate* isolate, const v8::Local<v8::Value>& exception, | 
| 23     const v8::Local<v8::Message>& message) | 23     const v8::Local<v8::Message>& message) | 
| 24   : std::runtime_error(ExceptionToString(exception, message)) | 24   : std::runtime_error(ExceptionToString(isolate, exception, message)) | 
| 25 { | 25 { | 
| 26 } | 26 } | 
| 27 | 27 | 
| 28 std::string JsError::ExceptionToString(const v8::Local<v8::Value>& exception, | 28 std::string JsError::ExceptionToString(v8::Isolate* isolate, | 
|  | 29   const v8::Local<v8::Value>& exception, | 
| 29   const v8::Local<v8::Message>& message) | 30   const v8::Local<v8::Message>& message) | 
| 30 { | 31 { | 
| 31   std::stringstream error; | 32   std::stringstream error; | 
| 32   error << *v8::String::Utf8Value(exception); | 33   error << *v8::String::Utf8Value(isolate, exception); | 
| 33   if (!message.IsEmpty()) | 34   if (!message.IsEmpty()) | 
| 34   { | 35   { | 
| 35     error << " at "; | 36     error << " at "; | 
| 36     error << *v8::String::Utf8Value(message->GetScriptResourceName()); | 37     error << *v8::String::Utf8Value(isolate, message->GetScriptResourceName()); | 
| 37     error << ":"; | 38     error << ":"; | 
| 38     error << message->GetLineNumber(); | 39     error << message->GetLineNumber(); | 
| 39   } | 40   } | 
| 40   return error.str(); | 41   return error.str(); | 
| 41 } | 42 } | 
| OLD | NEW | 
|---|