From 37621bdec61d9ab6bed64cce66498a0dbedb5853 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:45:54 +0000 Subject: [PATCH] chore: add missing gin::Wrappable GetTypeName overrides Co-authored-by: Shelley Vohr --- shell/browser/api/electron_api_data_pipe_holder.cc | 4 ++++ shell/browser/api/electron_api_data_pipe_holder.h | 2 ++ shell/browser/api/electron_api_power_save_blocker.cc | 4 ++++ shell/browser/api/electron_api_power_save_blocker.h | 4 ++-- shell/browser/api/electron_api_web_request.h | 3 +-- shell/browser/api/message_port.h | 2 +- shell/common/api/electron_api_url_loader.cc | 2 ++ shell/common/gin_converters/net_converter.cc | 2 ++ shell/common/gin_helper/event.cc | 4 ++++ shell/common/gin_helper/event.h | 1 + 10 files changed, 23 insertions(+), 5 deletions(-) diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc index 5b04ac29a196e..7842211d463bb 100644 --- a/shell/browser/api/electron_api_data_pipe_holder.cc +++ b/shell/browser/api/electron_api_data_pipe_holder.cc @@ -162,6 +162,10 @@ v8::Local DataPipeHolder::ReadAll(v8::Isolate* isolate) { return handle; } +const char* DataPipeHolder::GetTypeName() { + return "DataPipeHolder"; +} + // static gin::Handle DataPipeHolder::Create( v8::Isolate* isolate, diff --git a/shell/browser/api/electron_api_data_pipe_holder.h b/shell/browser/api/electron_api_data_pipe_holder.h index 17b9dd244abcb..cc3b1b32f63c9 100644 --- a/shell/browser/api/electron_api_data_pipe_holder.h +++ b/shell/browser/api/electron_api_data_pipe_holder.h @@ -18,7 +18,9 @@ namespace electron::api { // Retains reference to the data pipe. class DataPipeHolder : public gin::Wrappable { public: + // gin::Wrappable static gin::WrapperInfo kWrapperInfo; + const char* GetTypeName() override; static gin::Handle Create( v8::Isolate* isolate, diff --git a/shell/browser/api/electron_api_power_save_blocker.cc b/shell/browser/api/electron_api_power_save_blocker.cc index 2f3f9c727f655..c34ffe989f41c 100644 --- a/shell/browser/api/electron_api_power_save_blocker.cc +++ b/shell/browser/api/electron_api_power_save_blocker.cc @@ -124,6 +124,10 @@ gin::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder( .SetMethod("isStarted", &PowerSaveBlocker::IsStarted); } +const char* PowerSaveBlocker::GetTypeName() { + return "PowerSaveBlocker"; +} + } // namespace electron::api namespace { diff --git a/shell/browser/api/electron_api_power_save_blocker.h b/shell/browser/api/electron_api_power_save_blocker.h index ad60bfbd83e03..959b3529891bc 100644 --- a/shell/browser/api/electron_api_power_save_blocker.h +++ b/shell/browser/api/electron_api_power_save_blocker.h @@ -20,10 +20,10 @@ class PowerSaveBlocker : public gin::Wrappable { static gin::Handle Create(v8::Isolate* isolate); // gin::Wrappable + static gin::WrapperInfo kWrapperInfo; gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; - - static gin::WrapperInfo kWrapperInfo; + const char* GetTypeName() override; // disable copy PowerSaveBlocker(const PowerSaveBlocker&) = delete; diff --git a/shell/browser/api/electron_api_web_request.h b/shell/browser/api/electron_api_web_request.h index a4bf0a9e100ed..c11267b2fb9cc 100644 --- a/shell/browser/api/electron_api_web_request.h +++ b/shell/browser/api/electron_api_web_request.h @@ -24,8 +24,6 @@ namespace electron::api { class WebRequest : public gin::Wrappable, public WebRequestAPI { public: - static gin::WrapperInfo kWrapperInfo; - // Return the WebRequest object attached to |browser_context|, create if there // is no one. // Note that the lifetime of WebRequest object is managed by Session, instead @@ -44,6 +42,7 @@ class WebRequest : public gin::Wrappable, public WebRequestAPI { content::BrowserContext* browser_context); // gin::Wrappable: + static gin::WrapperInfo kWrapperInfo; gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; const char* GetTypeName() override; diff --git a/shell/browser/api/message_port.h b/shell/browser/api/message_port.h index 70fe2add2de8b..9239db2aa5223 100644 --- a/shell/browser/api/message_port.h +++ b/shell/browser/api/message_port.h @@ -53,9 +53,9 @@ class MessagePort : public gin::Wrappable, bool* threw_exception); // gin::Wrappable + static gin::WrapperInfo kWrapperInfo; gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; - static gin::WrapperInfo kWrapperInfo; const char* GetTypeName() override; private: diff --git a/shell/common/api/electron_api_url_loader.cc b/shell/common/api/electron_api_url_loader.cc index f84342dd81ee5..5f622845f98a3 100644 --- a/shell/common/api/electron_api_url_loader.cc +++ b/shell/common/api/electron_api_url_loader.cc @@ -182,6 +182,8 @@ class JSChunkedDataPipeGetter : public gin::Wrappable, .SetMethod("done", &JSChunkedDataPipeGetter::Done); } + const char* GetTypeName() override { return "JSChunkedDataPipeGetter"; } + static gin::WrapperInfo kWrapperInfo; ~JSChunkedDataPipeGetter() override = default; diff --git a/shell/common/gin_converters/net_converter.cc b/shell/common/gin_converters/net_converter.cc index ec89a403e573f..1f076e82a1ea3 100644 --- a/shell/common/gin_converters/net_converter.cc +++ b/shell/common/gin_converters/net_converter.cc @@ -271,6 +271,8 @@ class ChunkedDataPipeReadableStream .SetMethod("read", &ChunkedDataPipeReadableStream::Read); } + const char* GetTypeName() override { return "ChunkedDataPipeReadableStream"; } + static gin::WrapperInfo kWrapperInfo; private: diff --git a/shell/common/gin_helper/event.cc b/shell/common/gin_helper/event.cc index 347ee9ba978a2..e1ea3fd781cd7 100644 --- a/shell/common/gin_helper/event.cc +++ b/shell/common/gin_helper/event.cc @@ -28,4 +28,8 @@ Event::~Event() = default; gin::WrapperInfo Event::kWrapperInfo = {gin::kEmbedderNativeGin}; +const char* Event::GetTypeName() { + return GetClassName(); +} + } // namespace gin_helper::internal diff --git a/shell/common/gin_helper/event.h b/shell/common/gin_helper/event.h index b55426b9f5361..a1565ffb7d5f2 100644 --- a/shell/common/gin_helper/event.h +++ b/shell/common/gin_helper/event.h @@ -31,6 +31,7 @@ class Event : public gin::Wrappable, // gin::Wrappable static gin::WrapperInfo kWrapperInfo; + const char* GetTypeName() override; ~Event() override;