| 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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 <sstream> | 18 #include <sstream> |
| 19 #include <stdexcept> | 19 #include <stdexcept> |
| 20 | 20 |
| 21 #ifdef _WIN32 | 21 #ifdef _WIN32 |
| 22 #include <Windows.h> | 22 #include <Windows.h> |
| 23 #include <Shlwapi.h> | 23 #include <Shlwapi.h> |
| 24 #endif | 24 #endif |
| 25 | 25 |
| 26 #include "Utils.h" | 26 #include "Utils.h" |
| 27 #include <AdblockPlus/JsEngine.h> |
| 27 | 28 |
| 28 using namespace AdblockPlus; | 29 using namespace AdblockPlus; |
| 29 | 30 |
| 30 std::string Utils::Slurp(std::istream& stream) | 31 std::string Utils::Slurp(std::istream& stream) |
| 31 { | 32 { |
| 32 std::stringstream content; | 33 std::stringstream content; |
| 33 content << stream.rdbuf(); | 34 content << stream.rdbuf(); |
| 34 return content.str(); | 35 return content.str(); |
| 35 } | 36 } |
| 36 | 37 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 if (FAILED(hr)) | 98 if (FAILED(hr)) |
| 98 { | 99 { |
| 99 throw std::runtime_error("CanonizeUrl failed\n"); | 100 throw std::runtime_error("CanonizeUrl failed\n"); |
| 100 } | 101 } |
| 101 } | 102 } |
| 102 return canonizedUrl; | 103 return canonizedUrl; |
| 103 | 104 |
| 104 } | 105 } |
| 105 #endif | 106 #endif |
| 106 | 107 |
| 108 std::shared_ptr<JsEngine> Utils::lockJsEngine(const std::weak_ptr<JsEngine>& jsE
ngine) |
| 109 { |
| 110 auto retValue = jsEngine.lock(); |
| 111 if (!retValue) |
| 112 throw AdblockPlus::JsEngine::JsEngineNotAvailableException(); |
| 113 return retValue; |
| 114 } |
| OLD | NEW |