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

Side by Side 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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 traceback << ":" << frame->GetLineNumber(); 97 traceback << ":" << frame->GetLineNumber();
98 traceback << std::endl; 98 traceback << std::endl;
99 } 99 }
100 100
101 AdblockPlus::LogSystemPtr callback = jsEngine->GetLogSystem(); 101 AdblockPlus::LogSystemPtr callback = jsEngine->GetLogSystem();
102 (*callback)(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, traceback.str(), ""); 102 (*callback)(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, traceback.str(), "");
103 return v8::Undefined(); 103 return v8::Undefined();
104 } 104 }
105 } 105 }
106 106
107 AdblockPlus::JsValuePtr AdblockPlus::ConsoleJsObject::Setup( 107 AdblockPlus::JsValue& AdblockPlus::ConsoleJsObject::Setup(
108 AdblockPlus::JsEngine& jsEngine, const AdblockPlus::JsValuePtr& 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 }
OLDNEW
« no previous file with comments | « src/ConsoleJsObject.h ('k') | src/FileSystemJsObject.h » ('j') | src/JsEngine.cpp » ('J')

Powered by Google App Engine
This is Rietveld