diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/gin/converter.cc | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/gin/converter.cc')
| -rw-r--r-- | chromium/gin/converter.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/gin/converter.cc b/chromium/gin/converter.cc index 42fcd59adb9..975a5c8b9e5 100644 --- a/chromium/gin/converter.cc +++ b/chromium/gin/converter.cc @@ -141,9 +141,10 @@ bool Converter<std::string>::FromV8(Isolate* isolate, if (!val->IsString()) return false; Local<String> str = Local<String>::Cast(val); - int length = str->Utf8Length(); + int length = str->Utf8Length(isolate); out->resize(length); - str->WriteUtf8(&(*out)[0], length, NULL, String::NO_NULL_TERMINATION); + str->WriteUtf8(isolate, &(*out)[0], length, NULL, + String::NO_NULL_TERMINATION); return true; } @@ -217,11 +218,11 @@ v8::Local<v8::String> StringToSymbol(v8::Isolate* isolate, .ToLocalChecked(); } -std::string V8ToString(v8::Local<v8::Value> value) { +std::string V8ToString(v8::Isolate* isolate, v8::Local<v8::Value> value) { if (value.IsEmpty()) return std::string(); std::string result; - if (!ConvertFromV8(NULL, value, &result)) + if (!ConvertFromV8(isolate, value, &result)) return std::string(); return result; } |