From 5bb5a50b0a8633a2ec229cee7a5c6cd6780939bc Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 16 Nov 2023 08:40:42 -0800 Subject: [PATCH] Make `lib/ui/painting/...` compatible with `.clang_tidy`. (flutter/engine#47999) Work towards https://github.com/flutter/flutter/issues/134969. All changes were made automatically (i.e. with `--fix`). --- engine/src/flutter/lib/ui/painting/color_filter.h | 2 -- engine/src/flutter/lib/ui/painting/engine_layer.h | 5 +++-- .../flutter/lib/ui/painting/image_encoding_impl.h | 4 ++-- engine/src/flutter/lib/ui/painting/image_filter.h | 2 -- .../flutter/lib/ui/painting/multi_frame_codec.cc | 11 +++++------ .../src/flutter/lib/ui/painting/multi_frame_codec.h | 6 ++---- .../flutter/lib/ui/painting/single_frame_codec.cc | 13 +++++++------ .../flutter/lib/ui/painting/single_frame_codec.h | 8 +++----- 8 files changed, 22 insertions(+), 29 deletions(-) diff --git a/engine/src/flutter/lib/ui/painting/color_filter.h b/engine/src/flutter/lib/ui/painting/color_filter.h index 6679629554..3427d3d71e 100644 --- a/engine/src/flutter/lib/ui/painting/color_filter.h +++ b/engine/src/flutter/lib/ui/painting/color_filter.h @@ -9,8 +9,6 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "third_party/tonic/typed_data/typed_list.h" -using tonic::DartPersistentValue; - namespace flutter { // A handle to an SkCodec object. diff --git a/engine/src/flutter/lib/ui/painting/engine_layer.h b/engine/src/flutter/lib/ui/painting/engine_layer.h index e13a751718..163091d7bf 100644 --- a/engine/src/flutter/lib/ui/painting/engine_layer.h +++ b/engine/src/flutter/lib/ui/painting/engine_layer.h @@ -18,8 +18,9 @@ class EngineLayer : public RefCountedDartWrappable { public: ~EngineLayer() override; - static void MakeRetained(Dart_Handle dart_handle, - std::shared_ptr layer) { + static void MakeRetained( + Dart_Handle dart_handle, + const std::shared_ptr& layer) { auto engine_layer = fml::MakeRefCounted(layer); engine_layer->AssociateWithDartWrapper(dart_handle); } diff --git a/engine/src/flutter/lib/ui/painting/image_encoding_impl.h b/engine/src/flutter/lib/ui/painting/image_encoding_impl.h index 595f8276e4..c8af051dc5 100644 --- a/engine/src/flutter/lib/ui/painting/image_encoding_impl.h +++ b/engine/src/flutter/lib/ui/painting/image_encoding_impl.h @@ -16,8 +16,8 @@ namespace flutter { template sk_sp ConvertToRasterUsingResourceContext( - sk_sp image, - fml::WeakPtr resource_context, + const sk_sp& image, + const fml::WeakPtr& resource_context, const std::shared_ptr& is_gpu_disabled_sync_switch) { sk_sp surface; SkImageInfo surface_info = SkImageInfo::MakeN32Premul(image->dimensions()); diff --git a/engine/src/flutter/lib/ui/painting/image_filter.h b/engine/src/flutter/lib/ui/painting/image_filter.h index 7887473859..68d70b3f15 100644 --- a/engine/src/flutter/lib/ui/painting/image_filter.h +++ b/engine/src/flutter/lib/ui/painting/image_filter.h @@ -11,8 +11,6 @@ #include "flutter/lib/ui/painting/color_filter.h" #include "third_party/tonic/typed_data/typed_list.h" -using tonic::DartPersistentValue; - namespace tonic { class DartLibraryNatives; } // namespace tonic diff --git a/engine/src/flutter/lib/ui/painting/multi_frame_codec.cc b/engine/src/flutter/lib/ui/painting/multi_frame_codec.cc index 815034f8e0..32d1bd0695 100644 --- a/engine/src/flutter/lib/ui/painting/multi_frame_codec.cc +++ b/engine/src/flutter/lib/ui/painting/multi_frame_codec.cc @@ -33,14 +33,13 @@ MultiFrameCodec::State::State(std::shared_ptr generator) ImageGenerator::kInfinitePlayCount ? -1 : generator_->GetPlayCount() - 1), - is_impeller_enabled_(UIDartState::Current()->IsImpellerEnabled()), - nextFrameIndex_(0) {} + is_impeller_enabled_(UIDartState::Current()->IsImpellerEnabled()) {} static void InvokeNextFrameCallback( const fml::RefPtr& image, int duration, const std::string& decode_error, - std::unique_ptr callback, + std::unique_ptr callback, size_t trace_id) { std::shared_ptr dart_state = callback->dart_state().lock(); if (!dart_state) { @@ -183,7 +182,7 @@ MultiFrameCodec::State::GetNextFrameImage( } void MultiFrameCodec::State::GetNextFrameAndInvokeCallback( - std::unique_ptr callback, + std::unique_ptr callback, const fml::RefPtr& ui_task_runner, fml::WeakPtr resourceContext, fml::RefPtr unref_queue, @@ -233,7 +232,7 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) { FML_LOG(ERROR) << decode_error; task_runners.GetUITaskRunner()->PostTask(fml::MakeCopyable( [trace_id, decode_error = std::move(decode_error), - callback = std::make_unique( + callback = std::make_unique( tonic::DartState::Current(), callback_handle)]() mutable { InvokeNextFrameCallback(nullptr, 0, decode_error, std::move(callback), trace_id); @@ -242,7 +241,7 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) { } task_runners.GetIOTaskRunner()->PostTask(fml::MakeCopyable( - [callback = std::make_unique( + [callback = std::make_unique( tonic::DartState::Current(), callback_handle), weak_state = std::weak_ptr(state_), trace_id, ui_task_runner = task_runners.GetUITaskRunner(), diff --git a/engine/src/flutter/lib/ui/painting/multi_frame_codec.h b/engine/src/flutter/lib/ui/painting/multi_frame_codec.h index ef288f27bf..b0fd35c15d 100644 --- a/engine/src/flutter/lib/ui/painting/multi_frame_codec.h +++ b/engine/src/flutter/lib/ui/painting/multi_frame_codec.h @@ -11,8 +11,6 @@ #include -using tonic::DartPersistentValue; - namespace flutter { class MultiFrameCodec : public Codec { @@ -51,7 +49,7 @@ class MultiFrameCodec : public Codec { // The non-const members and functions below here are only read or written // to on the IO thread. They are not safe to access or write on the UI // thread. - int nextFrameIndex_; + int nextFrameIndex_ = 0; // The last decoded frame that's required to decode any subsequent frames. std::optional lastRequiredFrame_; // The index of the last decoded required frame. @@ -68,7 +66,7 @@ class MultiFrameCodec : public Codec { fml::RefPtr unref_queue); void GetNextFrameAndInvokeCallback( - std::unique_ptr callback, + std::unique_ptr callback, const fml::RefPtr& ui_task_runner, fml::WeakPtr resourceContext, fml::RefPtr unref_queue, diff --git a/engine/src/flutter/lib/ui/painting/single_frame_codec.cc b/engine/src/flutter/lib/ui/painting/single_frame_codec.cc index 758cc56c05..7f55ac8c85 100644 --- a/engine/src/flutter/lib/ui/painting/single_frame_codec.cc +++ b/engine/src/flutter/lib/ui/painting/single_frame_codec.cc @@ -9,11 +9,11 @@ namespace flutter { -SingleFrameCodec::SingleFrameCodec(fml::RefPtr descriptor, - uint32_t target_width, - uint32_t target_height) - : status_(Status::kNew), - descriptor_(std::move(descriptor)), +SingleFrameCodec::SingleFrameCodec( + const fml::RefPtr& descriptor, + uint32_t target_width, + uint32_t target_height) + : descriptor_(descriptor), target_width_(target_width), target_height_(target_height) {} @@ -97,7 +97,8 @@ Dart_Handle SingleFrameCodec::getNextFrame(Dart_Handle callback_handle) { codec->status_ = Status::kComplete; // Invoke any callbacks that were provided before the frame was decoded. - for (const DartPersistentValue& callback : codec->pending_callbacks_) { + for (const tonic::DartPersistentValue& callback : + codec->pending_callbacks_) { tonic::DartInvoke(callback.value(), {tonic::ToDart(codec->cached_image_), tonic::ToDart(0), tonic::ToDart(decode_error)}); diff --git a/engine/src/flutter/lib/ui/painting/single_frame_codec.h b/engine/src/flutter/lib/ui/painting/single_frame_codec.h index ef5fca8e58..8a1080b4d5 100644 --- a/engine/src/flutter/lib/ui/painting/single_frame_codec.h +++ b/engine/src/flutter/lib/ui/painting/single_frame_codec.h @@ -11,13 +11,11 @@ #include "flutter/lib/ui/painting/image_decoder.h" #include "flutter/lib/ui/painting/image_descriptor.h" -using tonic::DartPersistentValue; - namespace flutter { class SingleFrameCodec : public Codec { public: - SingleFrameCodec(fml::RefPtr descriptor, + SingleFrameCodec(const fml::RefPtr& descriptor, uint32_t target_width, uint32_t target_height); @@ -34,12 +32,12 @@ class SingleFrameCodec : public Codec { private: enum class Status { kNew, kInProgress, kComplete }; - Status status_; + Status status_ = Status::kNew; fml::RefPtr descriptor_; uint32_t target_width_; uint32_t target_height_; fml::RefPtr cached_image_; - std::vector pending_callbacks_; + std::vector pending_callbacks_; FML_FRIEND_MAKE_REF_COUNTED(SingleFrameCodec); FML_FRIEND_REF_COUNTED_THREAD_SAFE(SingleFrameCodec);