| Index: third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp
|
| index 58003b0a6f7d6d3024d295e8f9a9ad3719a5d26f..474708a6721bb4fbefc04a6e9439a70c6054d07a 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp
|
| @@ -153,12 +153,20 @@ PassOwnPtr<V8Regex> createSearchRegex(V8DebuggerImpl* debugger, const String& qu
|
|
|
| v8::Local<v8::String> toV8String(v8::Isolate* isolate, const String& string)
|
| {
|
| - return v8::String::NewFromUtf8(isolate, string.utf8().data(), v8::NewStringType::kNormal).ToLocalChecked();
|
| + if (string.isNull())
|
| + return v8::String::Empty(isolate);
|
| + if (string.is8Bit())
|
| + return v8::String::NewFromOneByte(isolate, string.characters8(), v8::NewStringType::kNormal, string.length()).ToLocalChecked();
|
| + return v8::String::NewFromTwoByte(isolate, reinterpret_cast<const uint16_t*>(string.characters16()), v8::NewStringType::kNormal, string.length()).ToLocalChecked();
|
| }
|
|
|
| v8::Local<v8::String> toV8StringInternalized(v8::Isolate* isolate, const String& string)
|
| {
|
| - return v8::String::NewFromUtf8(isolate, string.utf8().data(), v8::NewStringType::kInternalized).ToLocalChecked();
|
| + if (string.isNull())
|
| + return v8::String::Empty(isolate);
|
| + if (string.is8Bit())
|
| + return v8::String::NewFromOneByte(isolate, string.characters8(), v8::NewStringType::kInternalized, string.length()).ToLocalChecked();
|
| + return v8::String::NewFromTwoByte(isolate, reinterpret_cast<const uint16_t*>(string.characters16()), v8::NewStringType::kInternalized, string.length()).ToLocalChecked();
|
| }
|
|
|
| String toWTFString(v8::Local<v8::String> value)
|
|
|