| 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 12 matching lines...) Expand all Loading... |
| 23 #include "JsContext.h" | 23 #include "JsContext.h" |
| 24 #include "Utils.h" | 24 #include "Utils.h" |
| 25 | 25 |
| 26 namespace | 26 namespace |
| 27 { | 27 { |
| 28 v8::Handle<v8::Value> DoLog(AdblockPlus::LogSystem::LogLevel logLevel, | 28 v8::Handle<v8::Value> DoLog(AdblockPlus::LogSystem::LogLevel logLevel, |
| 29 const v8::Arguments& arguments) | 29 const v8::Arguments& arguments) |
| 30 { | 30 { |
| 31 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arg
uments); | 31 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arg
uments); |
| 32 const AdblockPlus::JsContext context(jsEngine); | 32 const AdblockPlus::JsContext context(jsEngine); |
| 33 AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(argumen
ts); | 33 AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| 34 | 34 |
| 35 std::stringstream message; | 35 std::stringstream message; |
| 36 for (size_t i = 0; i < converted.size(); i++) | 36 for (size_t i = 0; i < converted.size(); i++) |
| 37 { | 37 { |
| 38 if (i > 0) | 38 if (i > 0) |
| 39 message << " "; | 39 message << " "; |
| 40 message << converted[i]->AsString(); | 40 message << converted[i].AsString(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 std::stringstream source; | 43 std::stringstream source; |
| 44 v8::Local<v8::StackFrame> frame = v8::StackTrace::CurrentStackTrace(1)->GetF
rame(0); | 44 v8::Local<v8::StackFrame> frame = v8::StackTrace::CurrentStackTrace(1)->GetF
rame(0); |
| 45 source << AdblockPlus::Utils::FromV8String(frame->GetScriptName()); | 45 source << AdblockPlus::Utils::FromV8String(frame->GetScriptName()); |
| 46 source << ":" << frame->GetLineNumber(); | 46 source << ":" << frame->GetLineNumber(); |
| 47 | 47 |
| 48 AdblockPlus::LogSystemPtr callback = jsEngine->GetLogSystem(); | 48 AdblockPlus::LogSystemPtr callback = jsEngine->GetLogSystem(); |
| 49 (*callback)(logLevel, message.str(), source.str()); | 49 (*callback)(logLevel, message.str(), source.str()); |
| 50 return v8::Undefined(); | 50 return v8::Undefined(); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 72 | 72 |
| 73 v8::Handle<v8::Value> ErrorCallback(const v8::Arguments& arguments) | 73 v8::Handle<v8::Value> ErrorCallback(const v8::Arguments& arguments) |
| 74 { | 74 { |
| 75 return DoLog(AdblockPlus::LogSystem::LOG_LEVEL_ERROR, arguments); | 75 return DoLog(AdblockPlus::LogSystem::LOG_LEVEL_ERROR, arguments); |
| 76 } | 76 } |
| 77 | 77 |
| 78 v8::Handle<v8::Value> TraceCallback(const v8::Arguments& arguments) | 78 v8::Handle<v8::Value> TraceCallback(const v8::Arguments& arguments) |
| 79 { | 79 { |
| 80 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arg
uments); | 80 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arg
uments); |
| 81 const AdblockPlus::JsContext context(jsEngine); | 81 const AdblockPlus::JsContext context(jsEngine); |
| 82 AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(argumen
ts); | 82 AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| 83 | 83 |
| 84 std::stringstream traceback; | 84 std::stringstream traceback; |
| 85 v8::Local<v8::StackTrace> frames = v8::StackTrace::CurrentStackTrace(100); | 85 v8::Local<v8::StackTrace> frames = v8::StackTrace::CurrentStackTrace(100); |
| 86 for (int i = 0, l = frames->GetFrameCount(); i < l; i++) | 86 for (int i = 0, l = frames->GetFrameCount(); i < l; i++) |
| 87 { | 87 { |
| 88 v8::Local<v8::StackFrame> frame = frames->GetFrame(i); | 88 v8::Local<v8::StackFrame> frame = frames->GetFrame(i); |
| 89 traceback << (i + 1) << ": "; | 89 traceback << (i + 1) << ": "; |
| 90 std::string name = AdblockPlus::Utils::FromV8String(frame->GetFunctionName
()); | 90 std::string name = AdblockPlus::Utils::FromV8String(frame->GetFunctionName
()); |
| 91 if (name.size()) | 91 if (name.size()) |
| 92 traceback << name; | 92 traceback << name; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 108 AdblockPlus::JsEngine& jsEngine, AdblockPlus::JsValue& obj) | 108 AdblockPlus::JsEngine& jsEngine, AdblockPlus::JsValue& obj) |
| 109 { | 109 { |
| 110 obj.SetProperty("log", jsEngine.NewCallback(::LogCallback)); | 110 obj.SetProperty("log", jsEngine.NewCallback(::LogCallback)); |
| 111 obj.SetProperty("debug", jsEngine.NewCallback(::DebugCallback)); | 111 obj.SetProperty("debug", jsEngine.NewCallback(::DebugCallback)); |
| 112 obj.SetProperty("info", jsEngine.NewCallback(::InfoCallback)); | 112 obj.SetProperty("info", jsEngine.NewCallback(::InfoCallback)); |
| 113 obj.SetProperty("warn", jsEngine.NewCallback(::WarnCallback)); | 113 obj.SetProperty("warn", jsEngine.NewCallback(::WarnCallback)); |
| 114 obj.SetProperty("error", jsEngine.NewCallback(::ErrorCallback)); | 114 obj.SetProperty("error", jsEngine.NewCallback(::ErrorCallback)); |
| 115 obj.SetProperty("trace", jsEngine.NewCallback(::TraceCallback)); | 115 obj.SetProperty("trace", jsEngine.NewCallback(::TraceCallback)); |
| 116 return obj; | 116 return obj; |
| 117 } | 117 } |
| OLD | NEW |