| 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 #include "BaseJsTest.h" | 18 #include "BaseJsTest.h" |
| 19 | 19 |
| 20 void DelayedTimer::ProcessImmediateTimers(DelayedTimer::SharedTasks& timerTasks) |
| 21 { |
| 22 auto ii = timerTasks->begin(); |
| 23 while (ii != timerTasks->end()) |
| 24 { |
| 25 if (ii->timeout.count() == 0) |
| 26 { |
| 27 ii->callback(); |
| 28 ii = timerTasks->erase(ii); |
| 29 } |
| 30 else |
| 31 ++ii; |
| 32 } |
| 33 } |
| 34 |
| 20 JsEngineCreationParameters::JsEngineCreationParameters() | 35 JsEngineCreationParameters::JsEngineCreationParameters() |
| 21 : logSystem(std::make_shared<ThrowingLogSystem>()) | 36 : logSystem(std::make_shared<ThrowingLogSystem>()) |
| 22 , timer(new ThrowingTimer()) | 37 , timer(new ThrowingTimer()) |
| 23 , webRequest(new ThrowingWebRequest()) | 38 , webRequest(new ThrowingWebRequest()) |
| 24 , fileSystem(std::make_shared<ThrowingFileSystem>()) | 39 , fileSystem(std::make_shared<ThrowingFileSystem>()) |
| 25 { | 40 { |
| 26 } | 41 } |
| 27 | 42 |
| 28 AdblockPlus::JsEnginePtr CreateJsEngine(JsEngineCreationParameters&& jsEngineCre
ationParameters) | 43 AdblockPlus::JsEnginePtr CreateJsEngine(JsEngineCreationParameters&& jsEngineCre
ationParameters) |
| 29 { | 44 { |
| 30 static AdblockPlus::ScopedV8IsolatePtr isolate = std::make_shared<AdblockPlus:
:ScopedV8Isolate>(); | 45 static AdblockPlus::ScopedV8IsolatePtr isolate = std::make_shared<AdblockPlus:
:ScopedV8Isolate>(); |
| 31 auto jsEngine = AdblockPlus::JsEngine::New(jsEngineCreationParameters.appInfo, | 46 auto jsEngine = AdblockPlus::JsEngine::New(jsEngineCreationParameters.appInfo, |
| 32 std::move(jsEngineCreationParameters.timer), | 47 std::move(jsEngineCreationParameters.timer), |
| 33 std::move(jsEngineCreationParameters.webRequest), | 48 std::move(jsEngineCreationParameters.webRequest), |
| 34 isolate); | 49 isolate); |
| 35 jsEngine->SetLogSystem(std::move(jsEngineCreationParameters.logSystem)); | 50 jsEngine->SetLogSystem(std::move(jsEngineCreationParameters.logSystem)); |
| 36 jsEngine->SetFileSystem(std::move(jsEngineCreationParameters.fileSystem)); | 51 jsEngine->SetFileSystem(std::move(jsEngineCreationParameters.fileSystem)); |
| 37 return jsEngine; | 52 return jsEngine; |
| 38 } | 53 } |
| OLD | NEW |