From 65edca6565b120efc6de76daa30500295a6932d3 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 17 Nov 2023 15:00:13 -0800 Subject: [PATCH] Make `impeller/aiks/...` compatible with `.clang-tidy`. (flutter/engine#48152) --- .../flutter/impeller/aiks/canvas_recorder.h | 77 ++++++++++--------- .../aiks/canvas_recorder_unittests.cc | 58 +++++++------- .../impeller/aiks/testing/context_mock.h | 9 ++- .../flutter/impeller/aiks/trace_serializer.cc | 60 +++++++-------- 4 files changed, 104 insertions(+), 100 deletions(-) diff --git a/engine/src/flutter/impeller/aiks/canvas_recorder.h b/engine/src/flutter/impeller/aiks/canvas_recorder.h index cbffd833bfe..7a5b7f35c4b 100644 --- a/engine/src/flutter/impeller/aiks/canvas_recorder.h +++ b/engine/src/flutter/impeller/aiks/canvas_recorder.h @@ -8,43 +8,43 @@ #include "impeller/aiks/canvas.h" -#define FLT_CANVAS_RECORDER_OP_ARG(name) CanvasRecorderOp::name, &Canvas::name +#define FLT_CANVAS_RECORDER_OP_ARG(name) \ + CanvasRecorderOp::k##name, &Canvas::name namespace impeller { - /// TODO(tbd): These are very similar to `flutter::DisplayListOpType`. When /// golden tests can be written at a higher level, migrate these to /// flutter::DisplayListOpType. enum CanvasRecorderOp : uint16_t { - New, - Save, - SaveLayer, - Restore, - RestoreToCount, - ResetTransform, - Transform, - Concat, - PreConcat, - Translate, - Scale2, - Scale3, - Skew, - Rotate, - DrawPath, - DrawPaint, - DrawRect, - DrawRRect, - DrawCircle, - DrawPoints, - DrawImage, - DrawImageRect, - ClipPath, - ClipRect, - ClipRRect, - DrawPicture, - DrawTextFrame, - DrawVertices, - DrawAtlas, + kNew, + kSave, + kSaveLayer, + kRestore, + kRestoreToCount, + kResetTransform, + kTransform, + kConcat, + kPreConcat, + kTranslate, + kScale2, + kScale3, + kSkew, + kRotate, + kDrawPath, + kDrawPaint, + kDrawRect, + kDrawRRect, + kDrawCircle, + kDrawPoints, + kDrawImage, + kDrawImageRect, + kClipPath, + kClipRect, + kClipRRect, + kDrawPicture, + kDrawTextFrame, + kDrawVertices, + kDrawAtlas, }; // Canvas recorder should only be used when IMPELLER_TRACE_CANVAS is defined @@ -58,14 +58,14 @@ enum CanvasRecorderOp : uint16_t { template class CanvasRecorder { public: - CanvasRecorder() : canvas_() { serializer_.Write(CanvasRecorderOp::New); } + CanvasRecorder() : canvas_() { serializer_.Write(CanvasRecorderOp::kNew); } explicit CanvasRecorder(Rect cull_rect) : canvas_(cull_rect) { - serializer_.Write(CanvasRecorderOp::New); + serializer_.Write(CanvasRecorderOp::kNew); } explicit CanvasRecorder(IRect cull_rect) : canvas_(cull_rect) { - serializer_.Write(CanvasRecorderOp::New); + serializer_.Write(CanvasRecorderOp::kNew); } ~CanvasRecorder() {} @@ -92,11 +92,12 @@ class CanvasRecorder { } ////////////////////////////////////////////////////////////////////////////// - // Canvas Static Polymorphism //////////////////////////////////////////////// + // Canvas Static Polymorphism + // //////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// void Save() { - return ExecuteAndSerialize(CanvasRecorderOp::Save, &Canvas::Save); + return ExecuteAndSerialize(CanvasRecorderOp::kSave, &Canvas::Save); } void SaveLayer( @@ -150,13 +151,13 @@ class CanvasRecorder { void Scale(const Vector2& scale) { return ExecuteAndSerialize( - CanvasRecorderOp::Scale2, + CanvasRecorderOp::kScale2, static_cast(&Canvas::Scale), scale); } void Scale(const Vector3& scale) { return ExecuteAndSerialize( - CanvasRecorderOp::Scale3, + CanvasRecorderOp::kScale3, static_cast(&Canvas::Scale), scale); } diff --git a/engine/src/flutter/impeller/aiks/canvas_recorder_unittests.cc b/engine/src/flutter/impeller/aiks/canvas_recorder_unittests.cc index fe2e457f88d..e9d1890a9fd 100644 --- a/engine/src/flutter/impeller/aiks/canvas_recorder_unittests.cc +++ b/engine/src/flutter/impeller/aiks/canvas_recorder_unittests.cc @@ -61,20 +61,20 @@ class Serializer { TEST(CanvasRecorder, Save) { CanvasRecorder recorder; recorder.Save(); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Save); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kSave); } TEST(CanvasRecorder, SaveLayer) { CanvasRecorder recorder; Paint paint; recorder.SaveLayer(paint); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::SaveLayer); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kSaveLayer); } TEST(CanvasRecorder, Restore) { CanvasRecorder recorder; recorder.Restore(); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Restore); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kRestore); } TEST(CanvasRecorder, RestoreToCount) { @@ -82,140 +82,142 @@ TEST(CanvasRecorder, RestoreToCount) { recorder.Save(); recorder.RestoreToCount(0); ASSERT_EQ(recorder.GetSerializer().last_op_, - CanvasRecorderOp::RestoreToCount); + CanvasRecorderOp::kRestoreToCount); } TEST(CanvasRecorder, ResetTransform) { CanvasRecorder recorder; recorder.ResetTransform(); ASSERT_EQ(recorder.GetSerializer().last_op_, - CanvasRecorderOp::ResetTransform); + CanvasRecorderOp::kResetTransform); } TEST(CanvasRecorder, Transform) { CanvasRecorder recorder; recorder.Transform(Matrix()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Transform); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kTransform); } TEST(CanvasRecorder, Concat) { CanvasRecorder recorder; recorder.Concat(Matrix()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Concat); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kConcat); } TEST(CanvasRecorder, PreConcat) { CanvasRecorder recorder; recorder.PreConcat(Matrix()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::PreConcat); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kPreConcat); } TEST(CanvasRecorder, Translate) { CanvasRecorder recorder; recorder.Translate(Vector3()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Translate); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kTranslate); } TEST(CanvasRecorder, Scale2) { CanvasRecorder recorder; recorder.Scale(Vector2()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Scale2); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kScale2); } TEST(CanvasRecorder, Scale3) { CanvasRecorder recorder; recorder.Scale(Vector3()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Scale3); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kScale3); } TEST(CanvasRecorder, Skew) { CanvasRecorder recorder; recorder.Skew(0, 0); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Skew); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kSkew); } TEST(CanvasRecorder, Rotate) { CanvasRecorder recorder; recorder.Rotate(Radians(0)); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::Rotate); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kRotate); } TEST(CanvasRecorder, DrawPath) { CanvasRecorder recorder; recorder.DrawPath(Path(), Paint()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawPath); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPath); } TEST(CanvasRecorder, DrawPaint) { CanvasRecorder recorder; recorder.DrawPaint(Paint()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawPaint); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPaint); } TEST(CanvasRecorder, DrawRect) { CanvasRecorder recorder; recorder.DrawRect(Rect(), Paint()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawRect); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawRect); } TEST(CanvasRecorder, DrawRRect) { CanvasRecorder recorder; recorder.DrawRRect(Rect(), {}, Paint()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawRRect); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawRRect); } TEST(CanvasRecorder, DrawCircle) { CanvasRecorder recorder; recorder.DrawCircle(Point(), 0, Paint()); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawCircle); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawCircle); } TEST(CanvasRecorder, DrawPoints) { CanvasRecorder recorder; recorder.DrawPoints(std::vector{}, 0, Paint(), PointStyle::kRound); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawPoints); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPoints); } TEST(CanvasRecorder, DrawImage) { CanvasRecorder recorder; recorder.DrawImage({}, {}, {}, {}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawImage); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawImage); } TEST(CanvasRecorder, DrawImageRect) { CanvasRecorder recorder; recorder.DrawImageRect({}, {}, {}, {}, {}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawImageRect); + ASSERT_EQ(recorder.GetSerializer().last_op_, + CanvasRecorderOp::kDrawImageRect); } TEST(CanvasRecorder, ClipPath) { CanvasRecorder recorder; recorder.ClipPath({}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::ClipPath); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipPath); } TEST(CanvasRecorder, ClipRect) { CanvasRecorder recorder; recorder.ClipRect({}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::ClipRect); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipRect); } TEST(CanvasRecorder, ClipRRect) { CanvasRecorder recorder; recorder.ClipRRect({}, {}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::ClipRRect); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipRRect); } TEST(CanvasRecorder, DrawPicture) { CanvasRecorder recorder; recorder.DrawPicture({}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawPicture); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPicture); } TEST(CanvasRecorder, DrawTextFrame) { CanvasRecorder recorder; recorder.DrawTextFrame({}, {}, {}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawTextFrame); + ASSERT_EQ(recorder.GetSerializer().last_op_, + CanvasRecorderOp::kDrawTextFrame); } TEST(CanvasRecorder, DrawVertices) { @@ -223,13 +225,13 @@ TEST(CanvasRecorder, DrawVertices) { auto geometry = std::shared_ptr( new VerticesGeometry({}, {}, {}, {}, {}, {})); recorder.DrawVertices(geometry, {}, {}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawVertices); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawVertices); } TEST(CanvasRecorder, DrawAtlas) { CanvasRecorder recorder; recorder.DrawAtlas({}, {}, {}, {}, {}, {}, {}, {}); - ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::DrawAtlas); + ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawAtlas); } } // namespace testing diff --git a/engine/src/flutter/impeller/aiks/testing/context_mock.h b/engine/src/flutter/impeller/aiks/testing/context_mock.h index 59c1ead6cc4..c80ade623d4 100644 --- a/engine/src/flutter/impeller/aiks/testing/context_mock.h +++ b/engine/src/flutter/impeller/aiks/testing/context_mock.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include "gmock/gmock-function-mocker.h" @@ -18,8 +19,8 @@ namespace testing { class CommandBufferMock : public CommandBuffer { public: - CommandBufferMock(std::weak_ptr context) - : CommandBuffer(context) {} + explicit CommandBufferMock(std::weak_ptr context) + : CommandBuffer(std::move(context)) {} MOCK_METHOD(bool, IsValid, (), (const, override)); @@ -32,7 +33,7 @@ class CommandBufferMock : public CommandBuffer { static std::shared_ptr ForwardOnCreateRenderPass( CommandBuffer* command_buffer, - RenderTarget render_target) { + const RenderTarget& render_target) { return command_buffer->OnCreateRenderPass(render_target); } @@ -48,7 +49,7 @@ class CommandBufferMock : public CommandBuffer { (override)); static bool ForwardOnSubmitCommands(CommandBuffer* command_buffer, CompletionCallback callback) { - return command_buffer->OnSubmitCommands(callback); + return command_buffer->OnSubmitCommands(std::move(callback)); } MOCK_METHOD(void, OnWaitUntilScheduled, (), (override)); diff --git a/engine/src/flutter/impeller/aiks/trace_serializer.cc b/engine/src/flutter/impeller/aiks/trace_serializer.cc index c70fd23f329..14a82ed4362 100644 --- a/engine/src/flutter/impeller/aiks/trace_serializer.cc +++ b/engine/src/flutter/impeller/aiks/trace_serializer.cc @@ -116,35 +116,35 @@ std::ostream& operator<<(std::ostream& os, const Paint& paint) { namespace { std::string_view CanvasRecorderOpToString(CanvasRecorderOp op) { switch (op) { - FLT_CANVAS_RECORDER_OP_TO_STRING(New); - FLT_CANVAS_RECORDER_OP_TO_STRING(Save); - FLT_CANVAS_RECORDER_OP_TO_STRING(SaveLayer); - FLT_CANVAS_RECORDER_OP_TO_STRING(Restore); - FLT_CANVAS_RECORDER_OP_TO_STRING(RestoreToCount); - FLT_CANVAS_RECORDER_OP_TO_STRING(ResetTransform); - FLT_CANVAS_RECORDER_OP_TO_STRING(Transform); - FLT_CANVAS_RECORDER_OP_TO_STRING(Concat); - FLT_CANVAS_RECORDER_OP_TO_STRING(PreConcat); - FLT_CANVAS_RECORDER_OP_TO_STRING(Translate); - FLT_CANVAS_RECORDER_OP_TO_STRING(Scale2); - FLT_CANVAS_RECORDER_OP_TO_STRING(Scale3); - FLT_CANVAS_RECORDER_OP_TO_STRING(Skew); - FLT_CANVAS_RECORDER_OP_TO_STRING(Rotate); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawPath); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawPaint); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawRect); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawRRect); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawCircle); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawPoints); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawImage); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawImageRect); - FLT_CANVAS_RECORDER_OP_TO_STRING(ClipPath); - FLT_CANVAS_RECORDER_OP_TO_STRING(ClipRect); - FLT_CANVAS_RECORDER_OP_TO_STRING(ClipRRect); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawPicture); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawTextFrame); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawVertices); - FLT_CANVAS_RECORDER_OP_TO_STRING(DrawAtlas); + FLT_CANVAS_RECORDER_OP_TO_STRING(kNew); + FLT_CANVAS_RECORDER_OP_TO_STRING(kSave); + FLT_CANVAS_RECORDER_OP_TO_STRING(kSaveLayer); + FLT_CANVAS_RECORDER_OP_TO_STRING(kRestore); + FLT_CANVAS_RECORDER_OP_TO_STRING(kRestoreToCount); + FLT_CANVAS_RECORDER_OP_TO_STRING(kResetTransform); + FLT_CANVAS_RECORDER_OP_TO_STRING(kTransform); + FLT_CANVAS_RECORDER_OP_TO_STRING(kConcat); + FLT_CANVAS_RECORDER_OP_TO_STRING(kPreConcat); + FLT_CANVAS_RECORDER_OP_TO_STRING(kTranslate); + FLT_CANVAS_RECORDER_OP_TO_STRING(kScale2); + FLT_CANVAS_RECORDER_OP_TO_STRING(kScale3); + FLT_CANVAS_RECORDER_OP_TO_STRING(kSkew); + FLT_CANVAS_RECORDER_OP_TO_STRING(kRotate); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPath); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPaint); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawRect); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawRRect); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawCircle); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPoints); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawImage); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawImageRect); + FLT_CANVAS_RECORDER_OP_TO_STRING(kClipPath); + FLT_CANVAS_RECORDER_OP_TO_STRING(kClipRect); + FLT_CANVAS_RECORDER_OP_TO_STRING(kClipRRect); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPicture); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawTextFrame); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawVertices); + FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawAtlas); } } } // namespace @@ -152,7 +152,7 @@ std::string_view CanvasRecorderOpToString(CanvasRecorderOp op) { TraceSerializer::TraceSerializer() {} void TraceSerializer::Write(CanvasRecorderOp op) { - if (op == CanvasRecorderOp::New) { + if (op == CanvasRecorderOp::kNew) { FML_LOG(ERROR) << "######################################################"; } else { FML_LOG(ERROR) << CanvasRecorderOpToString(op) << ":" << buffer_.str();