Unified 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:
Created June 21, 2018, 11:17 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/JsValue.cpp ('K')
|
« src/JsValue.cpp ('k')
|
src/Utils.cpp » ('j')
|
src/Utils.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/Utils.h |
| =================================================================== |
| --- a/src/Utils.h |
| +++ b/src/Utils.h |
| @@ -51,18 +51,18 @@ |
| return value.ToLocalChecked(); |
| } |
| #define CHECKED_TO_LOCAL(isolate, value, tryCatch) \ |
| AdblockPlus::Utils::CheckedToLocal(isolate, value, tryCatch, __FILE__, __LINE__) |
| std::string FromV8String(v8::Isolate* isolate, const v8::Local<v8::Value>& value); |
| StringBuffer StringBufferFromV8String(v8::Isolate* isolate, const v8::Local<v8::Value>& value); |
| - v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& str); |
| - v8::Local<v8::String> StringBufferToV8String(v8::Isolate* isolate, const StringBuffer& bytes); |
| + v8::MaybeLocal<v8::String> ToV8String(v8::Isolate* isolate, const std::string& str); |
| + v8::MaybeLocal<v8::String> StringBufferToV8String(v8::Isolate* isolate, const StringBuffer& bytes); |
| void ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str); |
| // Code for templated function has to be in a header file, can't be in .cpp |
| template<class T> |
| T TrimString(const T& text) |
| { |
| // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring |
| T trimmed(text); |
