From 4ea1b6f29374569d05ac3eb3fd8d37e128601308 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Sat, 20 Jan 2024 12:34:13 -0500 Subject: [PATCH] wrapper: Format with clang-tidy (see #3632) --- include/wrapper/cef_byte_read_handler.h | 12 ++++----- include/wrapper/cef_helpers.h | 2 +- include/wrapper/cef_message_router.h | 6 ++--- include/wrapper/cef_resource_manager.h | 2 +- include/wrapper/cef_xml_object.h | 2 +- libcef_dll/wrapper/cef_byte_read_handler.cc | 2 +- libcef_dll/wrapper/cef_message_router.cc | 27 +++++++++------------ libcef_dll/wrapper/cef_resource_manager.cc | 18 ++++++-------- libcef_dll/wrapper/cef_scoped_temp_dir.cc | 2 +- libcef_dll/wrapper/cef_xml_object.cc | 5 ++-- libcef_dll/wrapper/cef_zip_archive.cc | 14 +++++------ 11 files changed, 43 insertions(+), 49 deletions(-) diff --git a/include/wrapper/cef_byte_read_handler.h b/include/wrapper/cef_byte_read_handler.h index 5dd041623..bb1f84fb4 100644 --- a/include/wrapper/cef_byte_read_handler.h +++ b/include/wrapper/cef_byte_read_handler.h @@ -60,16 +60,16 @@ class CefByteReadHandler : public CefReadHandler { CefByteReadHandler& operator=(const CefByteReadHandler&) = delete; // CefReadHandler methods. - virtual size_t Read(void* ptr, size_t size, size_t n) override; - virtual int Seek(int64_t offset, int whence) override; - virtual int64_t Tell() override; - virtual int Eof() override; - virtual bool MayBlock() override { return false; } + size_t Read(void* ptr, size_t size, size_t n) override; + int Seek(int64_t offset, int whence) override; + int64_t Tell() override; + int Eof() override; + bool MayBlock() override { return false; } private: const unsigned char* bytes_; int64_t size_; - int64_t offset_; + int64_t offset_ = 0; CefRefPtr source_; base::Lock lock_; diff --git a/include/wrapper/cef_helpers.h b/include/wrapper/cef_helpers.h index 4917c88ad..380488004 100644 --- a/include/wrapper/cef_helpers.h +++ b/include/wrapper/cef_helpers.h @@ -144,7 +144,7 @@ class CefScopedArgArray { values_[i] = argv[i]; array_[i] = const_cast(values_[i].c_str()); } - array_[argc] = NULL; + array_[argc] = nullptr; } CefScopedArgArray(const CefScopedArgArray&) = delete; diff --git a/include/wrapper/cef_message_router.h b/include/wrapper/cef_message_router.h index 6897603fe..6c1a96a11 100644 --- a/include/wrapper/cef_message_router.h +++ b/include/wrapper/cef_message_router.h @@ -347,7 +347,7 @@ class CefMessageRouterBrowserSide CefRefPtr frame, int64_t query_id) {} - virtual ~Handler() {} + virtual ~Handler() = default; }; /// @@ -435,7 +435,7 @@ class CefMessageRouterBrowserSide protected: // Protect against accidental deletion of this object. friend class base::RefCountedThreadSafe; - virtual ~CefMessageRouterBrowserSide() {} + virtual ~CefMessageRouterBrowserSide() = default; }; /// @@ -491,7 +491,7 @@ class CefMessageRouterRendererSide protected: // Protect against accidental deletion of this object. friend class base::RefCountedThreadSafe; - virtual ~CefMessageRouterRendererSide() {} + virtual ~CefMessageRouterRendererSide() = default; }; #endif // CEF_INCLUDE_WRAPPER_CEF_MESSAGE_ROUTER_H_ diff --git a/include/wrapper/cef_resource_manager.h b/include/wrapper/cef_resource_manager.h index f524b714f..5cb01feab 100644 --- a/include/wrapper/cef_resource_manager.h +++ b/include/wrapper/cef_resource_manager.h @@ -206,7 +206,7 @@ class CefResourceManager /// virtual void OnRequestCanceled(scoped_refptr request) {} - virtual ~Provider() {} + virtual ~Provider() = default; }; CefResourceManager(); diff --git a/include/wrapper/cef_xml_object.h b/include/wrapper/cef_xml_object.h index 361309841..61731cc13 100644 --- a/include/wrapper/cef_xml_object.h +++ b/include/wrapper/cef_xml_object.h @@ -184,7 +184,7 @@ class CefXmlObject : public base::RefCountedThreadSafe { void SetParent(CefXmlObject* parent); CefString name_; - CefXmlObject* parent_; + CefXmlObject* parent_ = nullptr; CefString value_; AttributeMap attributes_; ObjectVector children_; diff --git a/libcef_dll/wrapper/cef_byte_read_handler.cc b/libcef_dll/wrapper/cef_byte_read_handler.cc index a420b442a..fb1da915f 100644 --- a/libcef_dll/wrapper/cef_byte_read_handler.cc +++ b/libcef_dll/wrapper/cef_byte_read_handler.cc @@ -11,7 +11,7 @@ CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes, size_t size, CefRefPtr source) - : bytes_(bytes), size_(size), offset_(0), source_(source) {} + : bytes_(bytes), size_(size), source_(source) {} size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) { base::AutoLock lock_scope(lock_); diff --git a/libcef_dll/wrapper/cef_message_router.cc b/libcef_dll/wrapper/cef_message_router.cc index 787fcf47f..d095097bb 100644 --- a/libcef_dll/wrapper/cef_message_router.cc +++ b/libcef_dll/wrapper/cef_message_router.cc @@ -98,7 +98,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { CallbackImpl(const CallbackImpl&) = delete; CallbackImpl& operator=(const CallbackImpl&) = delete; - virtual ~CallbackImpl() { + ~CallbackImpl() override { // Hitting this DCHECK means that you didn't call Success or Failure // on the Callback after returning true from Handler::OnQuery. You must // call Failure to terminate persistent queries. @@ -191,7 +191,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { CefMessageRouterBrowserSideImpl& operator=( const CefMessageRouterBrowserSideImpl&) = delete; - virtual ~CefMessageRouterBrowserSideImpl() { + ~CefMessageRouterBrowserSideImpl() override { // There should be no pending queries when the router is deleted. DCHECK(browser_query_info_map_.empty()); } @@ -231,7 +231,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { // Need to iterate over each QueryInfo object to test the handler. class Visitor : public BrowserQueryInfoMap::Visitor { public: - explicit Visitor(Handler* handler) : handler_(handler), count_(0) {} + explicit Visitor(Handler* handler) : handler_(handler) {} bool OnNextInfo(int browser_id, InfoIdType info_id, @@ -247,7 +247,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { private: Handler* handler_; - int count_; + int count_ = 0; }; Visitor visitor(handler); @@ -398,8 +398,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { bool* removed) { class Visitor : public BrowserQueryInfoMap::Visitor { public: - explicit Visitor(bool always_remove) - : always_remove_(always_remove), removed_(false) {} + explicit Visitor(bool always_remove) : always_remove_(always_remove) {} bool OnNextInfo(int browser_id, InfoIdType info_id, @@ -413,7 +412,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { private: const bool always_remove_; - bool removed_; + bool removed_ = false; }; Visitor visitor(always_remove); @@ -779,7 +778,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { // Need to iterate over each RequestInfo object to test the context. class Visitor : public BrowserRequestInfoMap::Visitor { public: - explicit Visitor(int context_id) : context_id_(context_id), count_(0) {} + explicit Visitor(int context_id) : context_id_(context_id) {} bool OnNextInfo(int browser_id, InfoIdType info_id, @@ -795,7 +794,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { private: int context_id_; - int count_; + int count_ = 0; }; Visitor visitor(context_id); @@ -908,8 +907,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { bool* removed) { class Visitor : public BrowserRequestInfoMap::Visitor { public: - explicit Visitor(bool always_remove) - : always_remove_(always_remove), removed_(false) {} + explicit Visitor(bool always_remove) : always_remove_(always_remove) {} bool OnNextInfo(int browser_id, InfoIdType info_id, @@ -923,7 +921,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { private: const bool always_remove_; - bool removed_; + bool removed_ = false; }; Visitor visitor(always_remove); @@ -988,8 +986,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { // Cancel all requests with the specified context ID. class Visitor : public BrowserRequestInfoMap::Visitor { public: - explicit Visitor(int context_id) - : context_id_(context_id), cancel_count_(0) {} + explicit Visitor(int context_id) : context_id_(context_id) {} bool OnNextInfo(int browser_id, InfoIdType info_id, @@ -1007,7 +1004,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { private: const int context_id_; - int cancel_count_; + int cancel_count_ = 0; }; Visitor visitor(context_id); diff --git a/libcef_dll/wrapper/cef_resource_manager.cc b/libcef_dll/wrapper/cef_resource_manager.cc index 1df8aeb9b..a1e988589 100644 --- a/libcef_dll/wrapper/cef_resource_manager.cc +++ b/libcef_dll/wrapper/cef_resource_manager.cc @@ -5,6 +5,7 @@ #include "include/wrapper/cef_resource_manager.h" #include +#include #include #include "include/base/cef_callback.h" @@ -181,8 +182,7 @@ class ArchiveProvider : public CefResourceManager::Provider { : url_path_(url_path), archive_path_(archive_path), password_(password), - archive_load_started_(false), - archive_load_ended_(false), + weak_ptr_factory_(this) { DCHECK(!url_path_.empty()); DCHECK(!archive_path_.empty()); @@ -294,8 +294,8 @@ class ArchiveProvider : public CefResourceManager::Provider { std::string archive_path_; std::string password_; - bool archive_load_started_; - bool archive_load_ended_; + bool archive_load_started_ = false; + bool archive_load_ended_ = false; CefRefPtr archive_; // List of requests that are pending while the archive is being loaded. @@ -313,10 +313,7 @@ class ArchiveProvider : public CefResourceManager::Provider { struct CefResourceManager::ProviderEntry { ProviderEntry(Provider* provider, int order, const std::string& identifier) - : provider_(provider), - order_(order), - identifier_(identifier), - deletion_pending_(false) {} + : provider_(provider), order_(order), identifier_(identifier) {} std::unique_ptr provider_; int order_; @@ -326,7 +323,7 @@ struct CefResourceManager::ProviderEntry { RequestList pending_requests_; // True if deletion of this provider is pending. - bool deletion_pending_; + bool deletion_pending_ = false; }; // CefResourceManager::RequestState implementation. @@ -602,7 +599,8 @@ cef_return_value_t CefResourceManager::OnBeforeResourceLoad( // thread. This object performs most of its work on the IO thread and will // be destroyed on the IO thread so, now that we're on the IO thread, // properly initialize the WeakPtrFactory. - weak_ptr_factory_.reset(new base::WeakPtrFactory(this)); + weak_ptr_factory_ = + std::make_unique>(this); } state->manager_ = weak_ptr_factory_->GetWeakPtr(); diff --git a/libcef_dll/wrapper/cef_scoped_temp_dir.cc b/libcef_dll/wrapper/cef_scoped_temp_dir.cc index c1318933d..c15f197bb 100644 --- a/libcef_dll/wrapper/cef_scoped_temp_dir.cc +++ b/libcef_dll/wrapper/cef_scoped_temp_dir.cc @@ -7,7 +7,7 @@ #include "include/base/cef_logging.h" #include "include/cef_file_util.h" -CefScopedTempDir::CefScopedTempDir() {} +CefScopedTempDir::CefScopedTempDir() = default; CefScopedTempDir::~CefScopedTempDir() { if (!path_.empty() && !Delete()) { diff --git a/libcef_dll/wrapper/cef_xml_object.cc b/libcef_dll/wrapper/cef_xml_object.cc index 71d4f204f..1ff6f388d 100644 --- a/libcef_dll/wrapper/cef_xml_object.cc +++ b/libcef_dll/wrapper/cef_xml_object.cc @@ -158,10 +158,9 @@ class CefXmlObjectLoader { } // namespace -CefXmlObject::CefXmlObject(const CefString& name) - : name_(name), parent_(nullptr) {} +CefXmlObject::CefXmlObject(const CefString& name) : name_(name) {} -CefXmlObject::~CefXmlObject() {} +CefXmlObject::~CefXmlObject() = default; bool CefXmlObject::Load(CefRefPtr stream, CefXmlReader::EncodingType encodingType, diff --git a/libcef_dll/wrapper/cef_zip_archive.cc b/libcef_dll/wrapper/cef_zip_archive.cc index 3ebff15b0..aa2ad8a0d 100644 --- a/libcef_dll/wrapper/cef_zip_archive.cc +++ b/libcef_dll/wrapper/cef_zip_archive.cc @@ -27,7 +27,7 @@ CefString ToLower(const CefString& str) { class CefZipFile : public CefZipArchive::File { public: - CefZipFile() : data_size_(0) {} + CefZipFile() = default; CefZipFile(const CefZipFile&) = delete; CefZipFile& operator=(const CefZipFile&) = delete; @@ -44,11 +44,11 @@ class CefZipFile : public CefZipArchive::File { } } - virtual const unsigned char* GetData() const override { return data_.get(); } + const unsigned char* GetData() const override { return data_.get(); } - virtual size_t GetDataSize() const override { return data_size_; } + size_t GetDataSize() const override { return data_size_; } - virtual CefRefPtr GetStreamReader() const override { + CefRefPtr GetStreamReader() const override { CefRefPtr handler(new CefByteReadHandler( data_.get(), data_size_, const_cast(this))); return CefStreamReader::CreateForHandler(handler); @@ -57,7 +57,7 @@ class CefZipFile : public CefZipArchive::File { unsigned char* data() { return data_.get(); } private: - size_t data_size_; + size_t data_size_ = 0; std::unique_ptr data_; IMPLEMENT_REFCOUNTING(CefZipFile); @@ -67,9 +67,9 @@ class CefZipFile : public CefZipArchive::File { // CefZipArchive implementation -CefZipArchive::CefZipArchive() {} +CefZipArchive::CefZipArchive() = default; -CefZipArchive::~CefZipArchive() {} +CefZipArchive::~CefZipArchive() = default; size_t CefZipArchive::Load(CefRefPtr stream, const CefString& password,