Browse Source

refactor: remove ToV8(isolate, const char*) (#46108)

Charles Kerr 1 month ago
parent
commit
c4800d9934

+ 6 - 3
shell/browser/api/electron_api_web_frame_main.cc

@@ -459,11 +459,14 @@ std::vector<content::RenderFrameHost*> WebFrameMain::FramesInSubtree() const {
   return frame_hosts;
 }
 
-const char* WebFrameMain::LifecycleStateForTesting() const {
+std::string_view WebFrameMain::LifecycleStateForTesting() const {
   if (!HasRenderFrame())
     return {};
-  return content::RenderFrameHostImpl::LifecycleStateImplToString(
-      GetLifecycleState(render_frame_host()));
+  if (const char* str =
+          content::RenderFrameHostImpl::LifecycleStateImplToString(
+              GetLifecycleState(render_frame_host())))
+    return str;
+  return {};
 }
 
 v8::Local<v8::Promise> WebFrameMain::CollectDocumentJSCallStack(

+ 1 - 1
shell/browser/api/electron_api_web_frame_main.h

@@ -136,7 +136,7 @@ class WebFrameMain final : public gin::Wrappable<WebFrameMain>,
   std::vector<content::RenderFrameHost*> Frames() const;
   std::vector<content::RenderFrameHost*> FramesInSubtree() const;
 
-  const char* LifecycleStateForTesting() const;
+  std::string_view LifecycleStateForTesting() const;
 
   v8::Local<v8::Promise> CollectDocumentJSCallStack(gin::Arguments* args);
   void CollectedJavaScriptCallStack(

+ 0 - 9
shell/common/gin_converters/std_converter.h

@@ -61,15 +61,6 @@ struct Converter<char[N]> {
   }
 };
 
-template <>
-struct Converter<const char*> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const char* val) {
-    return v8::String::NewFromUtf8(isolate, val ? val : "",
-                                   v8::NewStringType::kNormal)
-        .ToLocalChecked();
-  }
-};
-
 template <>
 struct Converter<v8::Local<v8::Array>> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,