| 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 |
| 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 #ifndef ADBLOCK_PLUS_JS_ERROR_H | 18 #ifndef ADBLOCK_PLUS_JS_ERROR_H |
| 19 #define ADBLOCK_PLUS_JS_ERROR_H | 19 #define ADBLOCK_PLUS_JS_ERROR_H |
| 20 | 20 |
| 21 #include <sstream> | 21 #include <sstream> |
| 22 #include <stdexcept> | 22 #include <stdexcept> |
| 23 #include <v8.h> | 23 #include <v8.h> |
| 24 | 24 |
| 25 namespace | 25 namespace |
| 26 { | 26 { |
| 27 std::string ExceptionToString(const v8::Handle<v8::Value> exception, | 27 std::string ExceptionToString(const v8::Handle<v8::Value>& exception, |
| 28 const v8::Handle<v8::Message> message) | 28 const v8::Handle<v8::Message>& message) |
| 29 { | 29 { |
| 30 std::stringstream error; | 30 std::stringstream error; |
| 31 error << *v8::String::Utf8Value(exception); | 31 error << *v8::String::Utf8Value(exception); |
| 32 if (!message.IsEmpty()) | 32 if (!message.IsEmpty()) |
| 33 { | 33 { |
| 34 error << " at "; | 34 error << " at "; |
| 35 error << *v8::String::Utf8Value(message->GetScriptResourceName()); | 35 error << *v8::String::Utf8Value(message->GetScriptResourceName()); |
| 36 error << ":"; | 36 error << ":"; |
| 37 error << message->GetLineNumber(); | 37 error << message->GetLineNumber(); |
| 38 } | 38 } |
| 39 return error.str(); | 39 return error.str(); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 | 42 |
| 43 namespace AdblockPlus | 43 namespace AdblockPlus |
| 44 { | 44 { |
| 45 class JsError : public std::runtime_error | 45 class JsError : public std::runtime_error |
| 46 { | 46 { |
| 47 public: | 47 public: |
| 48 JsError(const v8::Handle<v8::Value> exception, | 48 JsError(const v8::Handle<v8::Value>& exception, |
| 49 const v8::Handle<v8::Message> message); | 49 const v8::Handle<v8::Message>& message); |
| 50 }; | 50 }; |
| 51 } | 51 } |
| 52 | 52 |
| 53 #endif | 53 #endif |
| OLD | NEW |