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