| 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 151 |
| 152 timerParams.erase(timerParams.begin()); // remove callback placeholder | 152 timerParams.erase(timerParams.begin()); // remove callback placeholder |
| 153 timerParams.erase(timerParams.begin()); // remove timeout param | 153 timerParams.erase(timerParams.begin()); // remove timeout param |
| 154 callback.Call(timerParams); | 154 callback.Call(timerParams); |
| 155 } | 155 } |
| 156 | 156 |
| 157 AdblockPlus::JsEngine::JsEngine(TimerPtr timer, FileSystemPtr fileSystem, | 157 AdblockPlus::JsEngine::JsEngine(TimerPtr timer, FileSystemPtr fileSystem, |
| 158 WebRequestPtr webRequest, LogSystemPtr logSystem) | 158 WebRequestPtr webRequest, LogSystemPtr logSystem) |
| 159 : fileSystem(std::move(fileSystem)) | 159 : fileSystem(std::move(fileSystem)) |
| 160 , timer(std::move(timer)) | 160 , timer(std::move(timer)) |
| 161 , logSystem(std::move(logSystem)) |
| 161 , webRequest(std::move(webRequest)) | 162 , webRequest(std::move(webRequest)) |
| 162 , logSystem(std::move(logSystem)) | |
| 163 { | 163 { |
| 164 } | 164 } |
| 165 | 165 |
| 166 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo, | 166 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo, |
| 167 TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest, LogSystemP
tr logSystem) | 167 TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest, LogSystemP
tr logSystem) |
| 168 { | 168 { |
| 169 JsEnginePtr result(new JsEngine(timer ? std::move(timer) : CreateDefaultTimer(
), | 169 JsEnginePtr result(new JsEngine(timer ? std::move(timer) : CreateDefaultTimer(
), |
| 170 fileSystem ? std::move(fileSystem) : CreateDefaultFileSystem(::DummySchedule
r), | 170 fileSystem ? std::move(fileSystem) : CreateDefaultFileSystem(::DummySchedule
r), |
| 171 webRequest ? std::move(webRequest) : CreateDefaultWebRequest(::DummySchedule
r), | 171 webRequest ? std::move(webRequest) : CreateDefaultWebRequest(::DummySchedule
r), |
| 172 logSystem ? std::move(logSystem) : CreateDefaultLogSystem())); | 172 logSystem ? std::move(logSystem) : CreateDefaultLogSystem())); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 { | 341 { |
| 342 return *logSystem; | 342 return *logSystem; |
| 343 } | 343 } |
| 344 | 344 |
| 345 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, | 345 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, |
| 346 const AdblockPlus::JsValue& value) | 346 const AdblockPlus::JsValue& value) |
| 347 { | 347 { |
| 348 auto global = GetGlobalObject(); | 348 auto global = GetGlobalObject(); |
| 349 global.SetProperty(name, value); | 349 global.SetProperty(name, value); |
| 350 } | 350 } |
| OLD | NEW |