Rename function to ToV8Value and mirror std::string_view overload

Author: szuend

src/inspector_js_api.cc

@@ -75,7 +75,8 @@ class JSBindingsConnection : public BaseObject {
       HandleScope handle_scope(isolate);
       Context::Scope context_scope(env_->context());
       Local<Value> argument;
-      if (!StringViewToV8String(isolate, message).ToLocal(&argument)) return;
+      if (!ToV8Value(env_->context(), message, isolate).ToLocal(&argument))
+        return;
       connection_->OnMessage(argument);
     }
 

src/util-inl.h

@@ -214,20 +214,6 @@ inline v8::Local<v8::String> OneByteString(v8::Isolate* isolate,
       .ToLocalChecked();
 }
 
-v8::MaybeLocal<v8::String> StringViewToV8String(
-    v8::Isolate* isolate, v8_inspector::StringView string) {
-  if (string.is8Bit()) {
-    return v8::String::NewFromOneByte(isolate,
-                                      string.characters8(),
-                                      v8::NewStringType::kNormal,
-                                      string.length());
-  }
-  return v8::String::NewFromTwoByte(isolate,
-                                    string.characters16(),
-                                    v8::NewStringType::kNormal,
-                                    string.length());
-}
-
 void SwapBytes16(char* data, size_t nbytes) {
   CHECK_EQ(nbytes % 2, 0);
 
@@ -455,6 +441,31 @@ v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
       .FromMaybe(v8::Local<v8::String>());
 }
 
+v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
+                                    v8_inspector::StringView str,
+                                    v8::Isolate* isolate) {
+  if (isolate == nullptr) isolate = context->GetIsolate();
+  if (UNLIKELY(str.length() >= static_cast<size_t>(v8::String::kMaxLength))) {
+    // V8 only has a TODO comment about adding an exception when the maximum
+    // string size is exceeded.
+    ThrowErrStringTooLong(isolate);
+    return v8::MaybeLocal<v8::Value>();
+  }
+
+  if (str.is8Bit()) {
+    return v8::String::NewFromOneByte(isolate,
+                                      str.characters8(),
+                                      v8::NewStringType::kNormal,
+                                      str.length())
+        .FromMaybe(v8::Local<v8::String>());
+  }
+  return v8::String::NewFromTwoByte(isolate,
+                                    str.characters16(),
+                                    v8::NewStringType::kNormal,
+                                    str.length())
+      .FromMaybe(v8::Local<v8::String>());
+}
+
 template <typename T>
 v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
                                     const std::vector<T>& vec,

src/util.h

@@ -354,10 +354,6 @@ inline v8::Local<v8::String> FIXED_ONE_BYTE_STRING(
   return OneByteString(isolate, arr.data(), N - 1);
 }
 
-// Convenience wrapper to handle both one- and two-byte inspector strings.
-inline v8::MaybeLocal<v8::String> StringViewToV8String(
-    v8::Isolate* isolate, v8_inspector::StringView string);
-
 // Swaps bytes in place. nbytes is the number of bytes to swap and must be a
 // multiple of the word size (checked by function).
 inline void SwapBytes16(char* data, size_t nbytes);
@@ -717,6 +713,9 @@ std::vector<std::string_view> SplitString(const std::string_view in,
 inline v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
                                            std::string_view str,
                                            v8::Isolate* isolate = nullptr);
+inline v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
+                                           v8_inspector::StringView str,
+                                           v8::Isolate* isolate);
 template <typename T, typename test_for_number =
     typename std::enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
 inline v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,