From 7cb5a46b66538c06cde1bba898c20b9b83d013e4 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 19:38:34 -0500 Subject: [PATCH] refactor: make TrackableObject::weak_map_id() constexpr (#47115) * refactor: make TrackableObject::weak_map_id() constexpr refactor: make BaseWindow::GetID() inline and constexpr Co-authored-by: Charles Kerr * refactor: make NativeWindow::window_id() constexpr too Co-authored-by: Charles Kerr --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr --- shell/browser/api/electron_api_base_window.cc | 4 ---- shell/browser/api/electron_api_base_window.h | 2 +- shell/browser/native_window.h | 2 +- shell/common/gin_helper/trackable_object.h | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc index d9f0a9987ccd..b795b5eeb263 100644 --- a/shell/browser/api/electron_api_base_window.cc +++ b/shell/browser/api/electron_api_base_window.cc @@ -1154,10 +1154,6 @@ void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, } #endif -int32_t BaseWindow::GetID() const { - return weak_map_id(); -} - void BaseWindow::RemoveFromParentChildWindows() { if (parent_window_.IsEmpty()) return; diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h index 0a44c592781e..e516bf278d9a 100644 --- a/shell/browser/api/electron_api_base_window.h +++ b/shell/browser/api/electron_api_base_window.h @@ -261,7 +261,7 @@ class BaseWindow : public gin_helper::TrackableObject, void SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args); #endif - int32_t GetID() const; + [[nodiscard]] constexpr int32_t GetID() const { return weak_map_id(); } private: // Helpers. diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h index b729b068fc87..1a49d624050e 100644 --- a/shell/browser/native_window.h +++ b/shell/browser/native_window.h @@ -405,7 +405,7 @@ class NativeWindow : public base::SupportsUserData, NativeWindow* parent() const { return parent_; } bool is_modal() const { return is_modal_; } - int32_t window_id() const { return window_id_; } + [[nodiscard]] constexpr int32_t window_id() const { return window_id_; } void add_child_window(NativeWindow* child) { child_windows_.push_back(child); diff --git a/shell/common/gin_helper/trackable_object.h b/shell/common/gin_helper/trackable_object.h index aa040aec5889..bedd6352ab2f 100644 --- a/shell/common/gin_helper/trackable_object.h +++ b/shell/common/gin_helper/trackable_object.h @@ -28,7 +28,7 @@ class TrackableObjectBase : public CleanedUpAtExit { TrackableObjectBase& operator=(const TrackableObjectBase&) = delete; // The ID in weak map. - int32_t weak_map_id() const { return weak_map_id_; } + [[nodiscard]] constexpr int32_t weak_map_id() const { return weak_map_id_; } // Wrap TrackableObject into a class that SupportsUserData. void AttachAsUserData(base::SupportsUserData* wrapped);