Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/Utils.cpp

Issue 29810573: Issue 6526 - Remove deprecated Utf8Value() usage (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Created June 19, 2018, 5:11 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/Utils.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 <stdexcept> 18 #include <stdexcept>
19 19
20 #ifdef _WIN32 20 #ifdef _WIN32
21 #include <Windows.h> 21 #include <Windows.h>
22 #include <Shlwapi.h> 22 #include <Shlwapi.h>
23 #endif 23 #endif
24 24
25 #include "Utils.h" 25 #include "Utils.h"
26 26
27 using namespace AdblockPlus; 27 using namespace AdblockPlus;
28 28
29 std::string Utils::FromV8String(const v8::Local<v8::Value>& value) 29 std::string Utils::FromV8String(v8::Isolate* isolate, const v8::Local<v8::Value> & value)
30 { 30 {
31 v8::String::Utf8Value stringValue(value); 31 v8::String::Utf8Value stringValue(isolate, 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::Local<v8::Value>& value) 38 StringBuffer Utils::StringBufferFromV8String(v8::Isolate* isolate, const v8::Loc al<v8::Value>& value)
39 { 39 {
40 v8::String::Utf8Value stringValue(value); 40 v8::String::Utf8Value stringValue(isolate, value);
41 if (stringValue.length()) 41 if (stringValue.length())
42 return IFileSystem::IOBuffer(*stringValue, *stringValue + stringValue.length ()); 42 return IFileSystem::IOBuffer(*stringValue, *stringValue + stringValue.length ());
43 else 43 else
44 return IFileSystem::IOBuffer(); 44 return IFileSystem::IOBuffer();
45 } 45 }
46 46
47 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)
48 { 48 {
49 return v8::String::NewFromUtf8(isolate, str.c_str(), 49 return v8::String::NewFromUtf8(isolate, str.c_str(),
50 v8::String::NewStringType::kNormalString, str.length()); 50 v8::String::NewStringType::kNormalString, str.length());
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 if (FAILED(hr)) 109 if (FAILED(hr))
110 { 110 {
111 throw std::runtime_error("CanonizeUrl failed\n"); 111 throw std::runtime_error("CanonizeUrl failed\n");
112 } 112 }
113 } 113 }
114 return canonizedUrl; 114 return canonizedUrl;
115 115
116 } 116 }
117 #endif 117 #endif
118 118
OLDNEW
« no previous file with comments | « src/Utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld