Left: | ||
Right: |
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) | 30 std::string Utils::Slurp(const std::istream& stream) |
sergei
2017/04/12 13:34:30
I would like to avoid having const here because we
| |
31 { | 31 { |
32 std::stringstream content; | 32 std::stringstream content; |
33 content << stream.rdbuf(); | 33 content << stream.rdbuf(); |
34 return content.str(); | 34 return content.str(); |
35 } | 35 } |
36 | 36 |
37 std::string Utils::FromV8String(v8::Handle<v8::Value> value) | 37 std::string Utils::FromV8String(const v8::Handle<v8::Value>& value) |
sergei
2017/04/12 13:34:30
I'm not sure that v8::Handle should be passed by r
sergei
2017/04/18 14:02:14
What about it?
hub
2017/04/18 16:18:50
I thought I had replied to this one. My take is th
| |
38 { | 38 { |
39 v8::String::Utf8Value stringValue(value); | 39 v8::String::Utf8Value stringValue(value); |
40 if (stringValue.length()) | 40 if (stringValue.length()) |
41 return std::string(*stringValue, stringValue.length()); | 41 return std::string(*stringValue, stringValue.length()); |
42 else | 42 else |
43 return std::string(); | 43 return std::string(); |
44 } | 44 } |
45 | 45 |
46 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string& str) | 46 v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string& str) |
47 { | 47 { |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 if (FAILED(hr)) | 97 if (FAILED(hr)) |
98 { | 98 { |
99 throw std::runtime_error("CanonizeUrl failed\n"); | 99 throw std::runtime_error("CanonizeUrl failed\n"); |
100 } | 100 } |
101 } | 101 } |
102 return canonizedUrl; | 102 return canonizedUrl; |
103 | 103 |
104 } | 104 } |
105 #endif | 105 #endif |
106 | 106 |
OLD | NEW |