| 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> | 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 | 27 |
| 28 using namespace AdblockPlus; | 28 using namespace AdblockPlus; |
| 29 | 29 |
| 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) | 30 std::string Utils::FromV8String(const v8::Handle<v8::Value>& value) |
| 38 { | 31 { |
| 39 v8::String::Utf8Value stringValue(value); | 32 v8::String::Utf8Value stringValue(value); |
| 40 if (stringValue.length()) | 33 if (stringValue.length()) |
| 41 return std::string(*stringValue, stringValue.length()); | 34 return std::string(*stringValue, stringValue.length()); |
| 42 else | 35 else |
| 43 return std::string(); | 36 return std::string(); |
| 44 } | 37 } |
| 45 | 38 |
| 39 std::vector<char> Utils::BufferFromV8String(const v8::Handle<v8::Value>& value) |
| 40 { |
| 41 v8::String::Utf8Value stringValue(value); |
| 42 if (stringValue.length()) |
| 43 return std::vector<char>(*stringValue, *stringValue + stringValue.length()); |
| 44 else |
| 45 return std::vector<char>(); |
| 46 } |
| 47 |
| 46 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string&
str) | 48 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string&
str) |
| 47 { | 49 { |
| 48 return v8::String::NewFromUtf8(isolate, str.c_str(), | 50 return v8::String::NewFromUtf8(isolate, str.c_str(), |
| 49 v8::String::NewStringType::kNormalString, str.length()); | 51 v8::String::NewStringType::kNormalString, str.length()); |
| 50 } | 52 } |
| 51 | 53 |
| 54 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::vector<
char>& str) |
| 55 { |
| 56 return v8::String::NewFromUtf8(isolate, str.data(), |
| 57 v8::String::NewStringType::kNormalString, str.size()); |
| 58 } |
| 59 |
| 52 void Utils::ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str) | 60 void Utils::ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str) |
| 53 { | 61 { |
| 54 isolate->ThrowException(Utils::ToV8String(isolate, str)); | 62 isolate->ThrowException(Utils::ToV8String(isolate, str)); |
| 55 } | 63 } |
| 56 | 64 |
| 57 #ifdef _WIN32 | 65 #ifdef _WIN32 |
| 58 std::wstring Utils::ToUtf16String(const std::string& str) | 66 std::wstring Utils::ToUtf16String(const std::string& str) |
| 59 { | 67 { |
| 60 size_t length = str.size(); | 68 size_t length = str.size(); |
| 61 if (length == 0) | 69 if (length == 0) |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 if (FAILED(hr)) | 109 if (FAILED(hr)) |
| 102 { | 110 { |
| 103 throw std::runtime_error("CanonizeUrl failed\n"); | 111 throw std::runtime_error("CanonizeUrl failed\n"); |
| 104 } | 112 } |
| 105 } | 113 } |
| 106 return canonizedUrl; | 114 return canonizedUrl; |
| 107 | 115 |
| 108 } | 116 } |
| 109 #endif | 117 #endif |
| 110 | 118 |
| OLD | NEW |