| 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 <sstream> | |
| 19 #include <stdexcept> | 18 #include <stdexcept> |
| 20 | 19 |
| 21 #ifdef _WIN32 | 20 #ifdef _WIN32 |
| 22 #include <Windows.h> | 21 #include <Windows.h> |
| 23 #include <Shlwapi.h> | 22 #include <Shlwapi.h> |
| 24 #endif | 23 #endif |
| 25 | 24 |
| 26 #include "Utils.h" | 25 #include "Utils.h" |
| 27 | 26 |
| 28 using namespace AdblockPlus; | 27 using namespace AdblockPlus; |
| 29 | 28 |
| 30 std::string Utils::Slurp(std::istream& stream) | |
| 31 { | |
| 32 std::stringstream content; | |
| 33 content << stream.rdbuf(); | |
| 34 return content.str(); | |
| 35 } | |
| 36 | |
| 37 std::string Utils::FromV8String(const v8::Handle<v8::Value>& value) | 29 std::string Utils::FromV8String(const v8::Handle<v8::Value>& value) |
| 38 { | 30 { |
| 39 v8::String::Utf8Value stringValue(value); | 31 v8::String::Utf8Value stringValue(value); |
| 40 if (stringValue.length()) | 32 if (stringValue.length()) |
| 41 return std::string(*stringValue, stringValue.length()); | 33 return std::string(*stringValue, stringValue.length()); |
| 42 else | 34 else |
| 43 return std::string(); | 35 return std::string(); |
| 44 } | 36 } |
| 45 | 37 |
| 46 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string&
str) | 38 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string&
str) |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 if (FAILED(hr)) | 93 if (FAILED(hr)) |
| 102 { | 94 { |
| 103 throw std::runtime_error("CanonizeUrl failed\n"); | 95 throw std::runtime_error("CanonizeUrl failed\n"); |
| 104 } | 96 } |
| 105 } | 97 } |
| 106 return canonizedUrl; | 98 return canonizedUrl; |
| 107 | 99 |
| 108 } | 100 } |
| 109 #endif | 101 #endif |
| 110 | 102 |
| OLD | NEW |