Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
322 AdblockPlus::FileSystemPtr AdblockPlus::JsEngine::GetAsyncFileSystem() const | 322 AdblockPlus::FileSystemPtr AdblockPlus::JsEngine::GetAsyncFileSystem() const |
323 { | 323 { |
324 return fileSystem; | 324 return fileSystem; |
325 } | 325 } |
326 | 326 |
327 void AdblockPlus::JsEngine::SetFileSystem(const AdblockPlus::FileSystemSyncPtr& val) | 327 void AdblockPlus::JsEngine::SetFileSystem(const AdblockPlus::FileSystemSyncPtr& val) |
328 { | 328 { |
329 if (!val) | 329 if (!val) |
330 throw std::runtime_error("FileSystem cannot be null"); | 330 throw std::runtime_error("FileSystem cannot be null"); |
331 | 331 |
332 fileSystemLegacy = val; | 332 fileSystem.reset(new DefaultFileSystem(val)); |
sergei
2017/07/05 10:03:21
BTW, this `fileSystemLegacy` member is not used, s
hub
2017/07/06 12:21:52
We don't have a visibility of what filesystem has
sergei
2017/07/06 14:14:04
I thought about removing of legacy member and sett
hub
2017/07/06 21:24:29
Done.
| |
333 } | 333 } |
334 | 334 |
335 void AdblockPlus::JsEngine::SetWebRequest(const AdblockPlus::WebRequestSharedPtr & val) | 335 void AdblockPlus::JsEngine::SetWebRequest(const AdblockPlus::WebRequestSharedPtr & val) |
336 { | 336 { |
337 if (!val) | 337 if (!val) |
338 throw std::runtime_error("WebRequest cannot be null"); | 338 throw std::runtime_error("WebRequest cannot be null"); |
339 | 339 |
340 webRequestLegacy = val; | 340 webRequestLegacy = val; |
341 } | 341 } |
342 | 342 |
(...skipping 10 matching lines...) Expand all Loading... | |
353 logSystem = val; | 353 logSystem = val; |
354 } | 354 } |
355 | 355 |
356 | 356 |
357 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, | 357 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, |
358 const AdblockPlus::JsValue& value) | 358 const AdblockPlus::JsValue& value) |
359 { | 359 { |
360 auto global = GetGlobalObject(); | 360 auto global = GetGlobalObject(); |
361 global.SetProperty(name, value); | 361 global.SetProperty(name, value); |
362 } | 362 } |
LEFT | RIGHT |