Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/ConsoleJsObject.cpp

Issue 29417605: Issue 5034 - Part 3: Create plain JsValue instead of JsValuePtr (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Pass JsEngine by ref Created April 20, 2017, 1:01 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « shell/src/PrefsCommand.cpp ('k') | src/FileSystemJsObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ConsoleJsObject.cpp
===================================================================
--- a/src/ConsoleJsObject.cpp
+++ b/src/ConsoleJsObject.cpp
@@ -25,24 +25,24 @@
namespace
{
v8::Handle<v8::Value> DoLog(AdblockPlus::LogSystem::LogLevel logLevel,
const v8::Arguments& arguments)
{
AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
const AdblockPlus::JsContext context(jsEngine);
- AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
+ AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
std::stringstream message;
for (size_t i = 0; i < converted.size(); i++)
{
if (i > 0)
message << " ";
- message << converted[i]->AsString();
+ message << converted[i].AsString();
}
std::stringstream source;
v8::Local<v8::StackFrame> frame = v8::StackTrace::CurrentStackTrace(1)->GetFrame(0);
source << AdblockPlus::Utils::FromV8String(frame->GetScriptName());
source << ":" << frame->GetLineNumber();
AdblockPlus::LogSystemPtr callback = jsEngine->GetLogSystem();
@@ -74,17 +74,17 @@
{
return DoLog(AdblockPlus::LogSystem::LOG_LEVEL_ERROR, arguments);
}
v8::Handle<v8::Value> TraceCallback(const v8::Arguments& arguments)
{
AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
const AdblockPlus::JsContext context(jsEngine);
- AdblockPlus::JsConstValueList converted = jsEngine->ConvertArguments(arguments);
+ AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
std::stringstream traceback;
v8::Local<v8::StackTrace> frames = v8::StackTrace::CurrentStackTrace(100);
for (int i = 0, l = frames->GetFrameCount(); i < l; i++)
{
v8::Local<v8::StackFrame> frame = frames->GetFrame(i);
traceback << (i + 1) << ": ";
std::string name = AdblockPlus::Utils::FromV8String(frame->GetFunctionName());
« no previous file with comments | « shell/src/PrefsCommand.cpp ('k') | src/FileSystemJsObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld