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

Side by Side Diff: src/Utils.h

Issue 29812649: Issue 6526 - *ToV8String() return MaybeLocal<> and check Call() return value (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Introduce CHECKED_TO_LOCAL_NOTHROW and use it. Created June 22, 2018, 3:49 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/JsValue.cpp ('k') | src/Utils.cpp » ('j') | 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
(...skipping 24 matching lines...) Expand all
35 { 35 {
36 void CheckTryCatch(v8::Isolate* isolate, const v8::TryCatch& tryCatch); 36 void CheckTryCatch(v8::Isolate* isolate, const v8::TryCatch& tryCatch);
37 37
38 /* 38 /*
39 * Check for exception and then that a MaybeLocal<> isn't empty, 39 * Check for exception and then that a MaybeLocal<> isn't empty,
40 * and throw a JsError if it is, otherwise return the Local<> 40 * and throw a JsError if it is, otherwise return the Local<>
41 * Call using the macro %CHECKED_MAYBE to get the location. 41 * Call using the macro %CHECKED_MAYBE to get the location.
42 */ 42 */
43 template<class T> 43 template<class T>
44 v8::Local<T> CheckedToLocal(v8::Isolate* isolate, 44 v8::Local<T> CheckedToLocal(v8::Isolate* isolate,
45 v8::MaybeLocal<T>&& value, const v8::TryCatch& tryCatch, 45 v8::MaybeLocal<T>&& value, const v8::TryCatch* tryCatch,
46 const char* filename, int line) 46 const char* filename, int line)
47 { 47 {
48 CheckTryCatch(isolate, tryCatch); 48 if (tryCatch)
49 CheckTryCatch(isolate, *tryCatch);
49 if (value.IsEmpty()) 50 if (value.IsEmpty())
50 throw AdblockPlus::JsError("Empty value at ", filename, line); 51 throw AdblockPlus::JsError("Empty value at ", filename, line);
51 return value.ToLocalChecked(); 52 return value.ToLocalChecked();
52 } 53 }
53 54
54 #define CHECKED_TO_LOCAL(isolate, value, tryCatch) \ 55 #define CHECKED_TO_LOCAL(isolate, value, tryCatch) \
55 AdblockPlus::Utils::CheckedToLocal(isolate, value, tryCatch, __FILE__, __LIN E__) 56 AdblockPlus::Utils::CheckedToLocal(isolate, value, &tryCatch, __FILE__, __LI NE__)
57
58 #define CHECKED_TO_LOCAL_NOTHROW(isolate, value) \
sergei 2018/07/05 08:39:00 What about adding something like NOTRYCATCH instea
hub 2018/07/11 02:11:02 Done.
59 AdblockPlus::Utils::CheckedToLocal(isolate, value, nullptr, __FILE__, __LINE __)
56 60
57 std::string FromV8String(v8::Isolate* isolate, const v8::Local<v8::Value>& v alue); 61 std::string FromV8String(v8::Isolate* isolate, const v8::Local<v8::Value>& v alue);
58 StringBuffer StringBufferFromV8String(v8::Isolate* isolate, const v8::Local< v8::Value>& value); 62 StringBuffer StringBufferFromV8String(v8::Isolate* isolate, const v8::Local< v8::Value>& value);
59 v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& st r); 63 v8::MaybeLocal<v8::String> ToV8String(v8::Isolate* isolate, const std::strin g& str);
60 v8::Local<v8::String> StringBufferToV8String(v8::Isolate* isolate, const Str ingBuffer& bytes); 64 v8::MaybeLocal<v8::String> StringBufferToV8String(v8::Isolate* isolate, cons t StringBuffer& bytes);
61 void ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str); 65 void ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str);
62 66
63 // Code for templated function has to be in a header file, can't be in .cpp 67 // Code for templated function has to be in a header file, can't be in .cpp
64 template<class T> 68 template<class T>
65 T TrimString(const T& text) 69 T TrimString(const T& text)
66 { 70 {
67 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-tri m-stdstring 71 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-tri m-stdstring
68 T trimmed(text); 72 T trimmed(text);
69 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end() , std::not1(std::ptr_fun<int, int>(std::isspace)))); 73 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end() , std::not1(std::ptr_fun<int, int>(std::isspace))));
70 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std ::ptr_fun<int, int>(std::isspace))).base(), trimmed.end()); 74 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std ::ptr_fun<int, int>(std::isspace))).base(), trimmed.end());
71 return trimmed; 75 return trimmed;
72 } 76 }
73 #ifdef _WIN32 77 #ifdef _WIN32
74 std::wstring ToUtf16String(const std::string& str); 78 std::wstring ToUtf16String(const std::string& str);
75 std::string ToUtf8String(const std::wstring& str); 79 std::string ToUtf8String(const std::wstring& str);
76 std::wstring CanonizeUrl(const std::wstring& url); 80 std::wstring CanonizeUrl(const std::wstring& url);
77 #endif 81 #endif
78 } 82 }
79 } 83 }
80 84
81 #endif 85 #endif
OLDNEW
« no previous file with comments | « src/JsValue.cpp ('k') | src/Utils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld