| Left: | ||
| Right: |
| 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 18 matching lines...) Expand all Loading... | |
| 29 { | 29 { |
| 30 ii->callback(); | 30 ii->callback(); |
| 31 ii = timerTasks->erase(ii); | 31 ii = timerTasks->erase(ii); |
| 32 } | 32 } |
| 33 else | 33 else |
| 34 ++ii; | 34 ++ii; |
| 35 } | 35 } |
| 36 } | 36 } |
| 37 | 37 |
| 38 FilterEnginePtr CreateFilterEngine(LazyFileSystem& fileSystem, | 38 FilterEnginePtr CreateFilterEngine(LazyFileSystem& fileSystem, |
| 39 const JsEnginePtr& jsEngine, | 39 Platform& paltform, |
|
hub
2017/08/07 12:05:56
typo here too.
sergei
2017/08/07 13:10:50
Good catch!
| |
| 40 const FilterEngine::CreationParameters& creationParams) | 40 const FilterEngine::CreationParameters& creationParams) |
| 41 { | 41 { |
| 42 std::list<LazyFileSystem::Task> fileSystemTasks; | 42 std::list<LazyFileSystem::Task> fileSystemTasks; |
| 43 fileSystem.scheduler = [&fileSystemTasks](const LazyFileSystem::Task& task) | 43 fileSystem.scheduler = [&fileSystemTasks](const LazyFileSystem::Task& task) |
| 44 { | 44 { |
| 45 fileSystemTasks.emplace_back(task); | 45 fileSystemTasks.emplace_back(task); |
| 46 }; | 46 }; |
| 47 FilterEnginePtr retValue; | 47 FilterEnginePtr retValue; |
| 48 FilterEngine::CreateAsync(jsEngine, [&retValue, &fileSystem](const FilterEngin ePtr& filterEngine) | 48 paltform.CreateFilterEngineAsync(creationParams, [&retValue, &fileSystem](cons t FilterEnginePtr& filterEngine) |
|
hub
2017/08/07 12:05:56
and here.
| |
| 49 { | 49 { |
| 50 retValue = filterEngine; | 50 retValue = filterEngine; |
| 51 fileSystem.scheduler = LazyFileSystem::ExecuteImmediately; | 51 fileSystem.scheduler = LazyFileSystem::ExecuteImmediately; |
| 52 }, creationParams); | 52 }); |
| 53 while (!retValue && !fileSystemTasks.empty()) | 53 while (!retValue && !fileSystemTasks.empty()) |
| 54 { | 54 { |
| 55 (*fileSystemTasks.begin())(); | 55 (*fileSystemTasks.begin())(); |
| 56 fileSystemTasks.pop_front(); | 56 fileSystemTasks.pop_front(); |
| 57 } | 57 } |
| 58 return retValue; | 58 return retValue; |
| 59 } | 59 } |
| 60 | 60 |
| 61 ThrowingPlatformCreationParameters::ThrowingPlatformCreationParameters() | 61 ThrowingPlatformCreationParameters::ThrowingPlatformCreationParameters() |
| 62 { | 62 { |
| 63 logSystem.reset(new ThrowingLogSystem()); | 63 logSystem.reset(new ThrowingLogSystem()); |
| 64 timer.reset(new ThrowingTimer()); | 64 timer.reset(new ThrowingTimer()); |
| 65 fileSystem = std::make_shared<ThrowingFileSystem>(); | 65 fileSystem = std::make_shared<ThrowingFileSystem>(); |
| 66 webRequest.reset(new ThrowingWebRequest()); | 66 webRequest.reset(new ThrowingWebRequest()); |
| 67 } | 67 } |
| OLD | NEW |