Unified Diff: src/ConsoleJsObject.cpp
Issue 29416579:
Issue 5034 - Part 1: Pass a JsValue directly to SetProperty() and return from GetProperty() (Closed)
Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set:
Created April 18, 2017, 9:17 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/ConsoleJsObject.h ('k')
|
src/FileSystemJsObject.h » ('j')
|
src/JsEngine.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/ConsoleJsObject.cpp |
| =================================================================== |
| --- a/src/ConsoleJsObject.cpp |
| +++ b/src/ConsoleJsObject.cpp |
| @@ -99,19 +99,19 @@ |
| } |
| AdblockPlus::LogSystemPtr callback = jsEngine->GetLogSystem(); |
| (*callback)(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, traceback.str(), ""); |
| return v8::Undefined(); |
| } |
| } |
| -AdblockPlus::JsValuePtr AdblockPlus::ConsoleJsObject::Setup( |
| - AdblockPlus::JsEngine& jsEngine, const AdblockPlus::JsValuePtr& obj) |
| +AdblockPlus::JsValue& AdblockPlus::ConsoleJsObject::Setup( |
| + AdblockPlus::JsEngine& jsEngine, AdblockPlus::JsValue& obj) |
| { |
| - obj->SetProperty("log", jsEngine.NewCallback(::LogCallback)); |
| - obj->SetProperty("debug", jsEngine.NewCallback(::DebugCallback)); |
| - obj->SetProperty("info", jsEngine.NewCallback(::InfoCallback)); |
| - obj->SetProperty("warn", jsEngine.NewCallback(::WarnCallback)); |
| - obj->SetProperty("error", jsEngine.NewCallback(::ErrorCallback)); |
| - obj->SetProperty("trace", jsEngine.NewCallback(::TraceCallback)); |
| + obj.SetProperty("log", *jsEngine.NewCallback(::LogCallback)); |
| + obj.SetProperty("debug", *jsEngine.NewCallback(::DebugCallback)); |
| + obj.SetProperty("info", *jsEngine.NewCallback(::InfoCallback)); |
| + obj.SetProperty("warn", *jsEngine.NewCallback(::WarnCallback)); |
| + obj.SetProperty("error", *jsEngine.NewCallback(::ErrorCallback)); |
| + obj.SetProperty("trace", *jsEngine.NewCallback(::TraceCallback)); |
| return obj; |
| } |
« no previous file with comments
|
« src/ConsoleJsObject.h ('k')
|
src/FileSystemJsObject.h » ('j')
|
src/JsEngine.cpp » ('J')
