From c0d1c3481aec7cf20d4118ab5036df8ec95e954f Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:55:56 -0500 Subject: [PATCH] fix: modernize-use-nodiscard clang-tidy warnings (#44833) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr --- shell/browser/electron_permission_manager.cc | 2 +- shell/browser/osr/osr_render_widget_host_view.cc | 8 ++++---- shell/common/api/electron_api_url_loader.cc | 2 +- shell/common/extensions/electron_extensions_client.cc | 6 +++--- shell/common/gin_converters/osr_converter.cc | 2 +- shell/common/gin_helper/callback.cc | 2 +- shell/common/heap_snapshot.cc | 2 +- shell/renderer/api/electron_api_spell_check_client.cc | 2 +- shell/renderer/renderer_client_base.cc | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc index efd523b53386..62e687cab4f6 100644 --- a/shell/browser/electron_permission_manager.cc +++ b/shell/browser/electron_permission_manager.cc @@ -86,7 +86,7 @@ class ElectronPermissionManager::PendingRequest { return content::RenderFrameHost::FromID(render_frame_host_id_); } - bool IsComplete() const { return remaining_results_ == 0; } + [[nodiscard]] bool IsComplete() const { return remaining_results_ == 0; } void RunCallback() { if (!callback_.is_null()) { diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc index c7b0a1b6dc0a..7ac417f0dbd7 100644 --- a/shell/browser/osr/osr_render_widget_host_view.cc +++ b/shell/browser/osr/osr_render_widget_host_view.cc @@ -135,15 +135,15 @@ class ElectronDelegatedFrameHostClient const ElectronDelegatedFrameHostClient&) = delete; // content::DelegatedFrameHostClient - ui::Layer* DelegatedFrameHostGetLayer() const override { + [[nodiscard]] ui::Layer* DelegatedFrameHostGetLayer() const override { return view_->root_layer(); } - bool DelegatedFrameHostIsVisible() const override { + [[nodiscard]] bool DelegatedFrameHostIsVisible() const override { return view_->IsShowing(); } - SkColor DelegatedFrameHostGetGutterColor() const override { + [[nodiscard]] SkColor DelegatedFrameHostGetGutterColor() const override { if (view_->render_widget_host()->delegate() && view_->render_widget_host()->delegate()->IsFullscreen()) { return SK_ColorWHITE; @@ -156,7 +156,7 @@ class ElectronDelegatedFrameHostClient view_->render_widget_host()->DidProcessFrame(frame_token, activation_time); } - float GetDeviceScaleFactor() const override { + [[nodiscard]] float GetDeviceScaleFactor() const override { return view_->GetDeviceScaleFactor(); } diff --git a/shell/common/api/electron_api_url_loader.cc b/shell/common/api/electron_api_url_loader.cc index 0aa8734c9f68..947e233711d4 100644 --- a/shell/common/api/electron_api_url_loader.cc +++ b/shell/common/api/electron_api_url_loader.cc @@ -149,7 +149,7 @@ class BufferDataSource : public mojo::DataPipeProducer::DataSource { private: // mojo::DataPipeProducer::DataSource: - uint64_t GetLength() const override { return buffer_.size(); } + [[nodiscard]] uint64_t GetLength() const override { return buffer_.size(); } ReadResult Read(uint64_t offset, base::span buffer) override { ReadResult result; if (offset <= buffer_.size()) { diff --git a/shell/common/extensions/electron_extensions_client.cc b/shell/common/extensions/electron_extensions_client.cc index 3604149118f1..c6cb44997ed6 100644 --- a/shell/common/extensions/electron_extensions_client.cc +++ b/shell/common/extensions/electron_extensions_client.cc @@ -38,12 +38,12 @@ class ElectronPermissionMessageProvider const ElectronPermissionMessageProvider&) = delete; // PermissionMessageProvider implementation. - extensions::PermissionMessages GetPermissionMessages( + [[nodiscard]] extensions::PermissionMessages GetPermissionMessages( const extensions::PermissionIDSet& permissions) const override { return extensions::PermissionMessages(); } - bool IsPrivilegeIncrease( + [[nodiscard]] bool IsPrivilegeIncrease( const extensions::PermissionSet& granted_permissions, const extensions::PermissionSet& requested_permissions, extensions::Manifest::Type extension_type) const override { @@ -52,7 +52,7 @@ class ElectronPermissionMessageProvider return false; } - extensions::PermissionIDSet GetAllPermissionIDs( + [[nodiscard]] extensions::PermissionIDSet GetAllPermissionIDs( const extensions::PermissionSet& permissions, extensions::Manifest::Type extension_type) const override { return extensions::PermissionIDSet(); diff --git a/shell/common/gin_converters/osr_converter.cc b/shell/common/gin_converters/osr_converter.cc index c311531427b2..7ccc1d71ec88 100644 --- a/shell/common/gin_converters/osr_converter.cc +++ b/shell/common/gin_converters/osr_converter.cc @@ -54,7 +54,7 @@ struct OffscreenReleaseHolderMonitor { holder_ = nullptr; } - bool IsTextureReleased() const { return holder_ == nullptr; } + [[nodiscard]] bool IsTextureReleased() const { return holder_ == nullptr; } v8::Persistent* CreatePersistent(v8::Isolate* isolate, v8::Local value) { diff --git a/shell/common/gin_helper/callback.cc b/shell/common/gin_helper/callback.cc index fd6927e0ffbe..fdc65b79200a 100644 --- a/shell/common/gin_helper/callback.cc +++ b/shell/common/gin_helper/callback.cc @@ -88,7 +88,7 @@ class RefCountedGlobal RefCountedGlobal(v8::Isolate* isolate, v8::Local value) : handle_(isolate, value.As()) {} - bool IsAlive() const { return !handle_.IsEmpty(); } + [[nodiscard]] bool IsAlive() const { return !handle_.IsEmpty(); } v8::Local NewHandle(v8::Isolate* isolate) const { return v8::Local::New(isolate, handle_); diff --git a/shell/common/heap_snapshot.cc b/shell/common/heap_snapshot.cc index bd509d6dde69..391185ba9f9e 100644 --- a/shell/common/heap_snapshot.cc +++ b/shell/common/heap_snapshot.cc @@ -18,7 +18,7 @@ class HeapSnapshotOutputStream : public v8::OutputStream { DCHECK(file_); } - bool IsComplete() const { return is_complete_; } + [[nodiscard]] bool IsComplete() const { return is_complete_; } // v8::OutputStream int GetChunkSize() override { return 65536; } diff --git a/shell/renderer/api/electron_api_spell_check_client.cc b/shell/renderer/api/electron_api_spell_check_client.cc index 78c4c955b0f4..b97f1771ff72 100644 --- a/shell/renderer/api/electron_api_spell_check_client.cc +++ b/shell/renderer/api/electron_api_spell_check_client.cc @@ -58,7 +58,7 @@ class SpellCheckClient::SpellcheckRequest { SpellcheckRequest& operator=(const SpellcheckRequest&) = delete; ~SpellcheckRequest() = default; - const std::u16string& text() const { return text_; } + [[nodiscard]] const std::u16string& text() const { return text_; } blink::WebTextCheckingCompletion* completion() { return completion_.get(); } std::vector& wordlist() { return word_list_; } diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc index e389d9267628..b58c3c35a902 100644 --- a/shell/renderer/renderer_client_base.cc +++ b/shell/renderer/renderer_client_base.cc @@ -131,7 +131,7 @@ class ChromePdfInternalPluginDelegate final ~ChromePdfInternalPluginDelegate() override = default; // `pdf::PdfInternalPluginDelegate`: - bool IsAllowedOrigin(const url::Origin& origin) const override { + [[nodiscard]] bool IsAllowedOrigin(const url::Origin& origin) const override { return origin.scheme() == extensions::kExtensionScheme && origin.host() == extension_misc::kPdfExtensionId; }