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

Side by Side Diff: src/Utils.h

Issue 29361562: Issue 3594 - remove circular references JsEngine-JsValue-JsEngine (Closed)
Patch Set: temporary workaround for race condition Created Dec. 1, 2016, 10:26 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 #ifndef ADBLOCK_PLUS_UTILS_H 18 #ifndef ADBLOCK_PLUS_UTILS_H
19 #define ADBLOCK_PLUS_UTILS_H 19 #define ADBLOCK_PLUS_UTILS_H
20 20
21 #include <algorithm> 21 #include <algorithm>
22 #include <cctype> 22 #include <cctype>
23 #include <functional> 23 #include <functional>
24 #include <istream> 24 #include <istream>
25 #include <string> 25 #include <string>
26 #include <memory>
26 #include <v8.h> 27 #include <v8.h>
27 28
28 namespace AdblockPlus 29 namespace AdblockPlus
29 { 30 {
31 class JsEngine;
30 namespace Utils 32 namespace Utils
31 { 33 {
32 std::string Slurp(std::istream& stream); 34 std::string Slurp(std::istream& stream);
33 std::string FromV8String(v8::Handle<v8::Value> value); 35 std::string FromV8String(v8::Handle<v8::Value> value);
34 v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& st r); 36 v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& st r);
35 37
36 // Code for templated function has to be in a header file, can't be in .cpp 38 // Code for templated function has to be in a header file, can't be in .cpp
37 template<class T> 39 template<class T>
38 T TrimString(T text) 40 T TrimString(T text)
39 { 41 {
40 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-tri m-stdstring 42 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-tri m-stdstring
41 T trimmed(text); 43 T trimmed(text);
42 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end() , std::not1(std::ptr_fun<int, int>(std::isspace)))); 44 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end() , std::not1(std::ptr_fun<int, int>(std::isspace))));
43 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std ::ptr_fun<int, int>(std::isspace))).base(), trimmed.end()); 45 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std ::ptr_fun<int, int>(std::isspace))).base(), trimmed.end());
44 return trimmed; 46 return trimmed;
45 } 47 }
46 #ifdef _WIN32 48 #ifdef _WIN32
47 std::wstring ToUtf16String(const std::string& str); 49 std::wstring ToUtf16String(const std::string& str);
48 std::string ToUtf8String(const std::wstring& str); 50 std::string ToUtf8String(const std::wstring& str);
49 std::wstring CanonizeUrl(const std::wstring& url); 51 std::wstring CanonizeUrl(const std::wstring& url);
50 #endif 52 #endif
53 std::shared_ptr<JsEngine> lockJsEngine(const std::weak_ptr<JsEngine>& jsEngi ne);
51 } 54 }
52 } 55 }
53 56
54 #endif 57 #endif
OLDNEW
« src/JsValue.cpp ('K') | « src/Thread.cpp ('k') | src/Utils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld