Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 56841d4

Browse files
authored
Clang-tidy: made verbose print out commands and fixed quoting problem for warnings as errors (#37015)
1 parent 3b086a0 commit 56841d4

File tree

66 files changed

+327
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+327
-275
lines changed

display_list/display_list_builder.cc

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ void DisplayListBuilder::drawPoints(SkCanvas::PointMode mode,
863863
}
864864
void DisplayListBuilder::drawSkVertices(const sk_sp<SkVertices> vertices,
865865
SkBlendMode mode) {
866-
Push<DrawSkVerticesOp>(0, 1, std::move(vertices), mode);
866+
Push<DrawSkVerticesOp>(0, 1, vertices, mode);
867867
// DrawVertices applies its colors to the paint so we have no way
868868
// of controlling opacity using the current paint attributes.
869869
// Although, examination of the |mode| might find some predictable
@@ -892,8 +892,8 @@ void DisplayListBuilder::drawImage(const sk_sp<DlImage> image,
892892
DlImageSampling sampling,
893893
bool render_with_attributes) {
894894
render_with_attributes
895-
? Push<DrawImageWithAttrOp>(0, 1, std::move(image), point, sampling)
896-
: Push<DrawImageOp>(0, 1, std::move(image), point, sampling);
895+
? Push<DrawImageWithAttrOp>(0, 1, image, point, sampling)
896+
: Push<DrawImageOp>(0, 1, image, point, sampling);
897897
CheckLayerOpacityCompatibility(render_with_attributes);
898898
}
899899
void DisplayListBuilder::drawImage(const sk_sp<DlImage>& image,
@@ -914,8 +914,8 @@ void DisplayListBuilder::drawImageRect(const sk_sp<DlImage> image,
914914
DlImageSampling sampling,
915915
bool render_with_attributes,
916916
SkCanvas::SrcRectConstraint constraint) {
917-
Push<DrawImageRectOp>(0, 1, std::move(image), src, dst, sampling,
918-
render_with_attributes, constraint);
917+
Push<DrawImageRectOp>(0, 1, image, src, dst, sampling, render_with_attributes,
918+
constraint);
919919
CheckLayerOpacityCompatibility(render_with_attributes);
920920
}
921921
void DisplayListBuilder::drawImageRect(const sk_sp<DlImage>& image,
@@ -938,9 +938,8 @@ void DisplayListBuilder::drawImageNine(const sk_sp<DlImage> image,
938938
DlFilterMode filter,
939939
bool render_with_attributes) {
940940
render_with_attributes
941-
? Push<DrawImageNineWithAttrOp>(0, 1, std::move(image), center, dst,
942-
filter)
943-
: Push<DrawImageNineOp>(0, 1, std::move(image), center, dst, filter);
941+
? Push<DrawImageNineWithAttrOp>(0, 1, image, center, dst, filter)
942+
: Push<DrawImageNineOp>(0, 1, image, center, dst, filter);
944943
CheckLayerOpacityCompatibility(render_with_attributes);
945944
}
946945
void DisplayListBuilder::drawImageNine(const sk_sp<DlImage>& image,
@@ -971,9 +970,9 @@ void DisplayListBuilder::drawImageLattice(const sk_sp<DlImage> image,
971970
(x_div_count + y_div_count) * sizeof(int) +
972971
cell_count * (sizeof(SkColor) + sizeof(SkCanvas::Lattice::RectType));
973972
SkIRect src = lattice.fBounds ? *lattice.fBounds : image->bounds();
974-
void* pod = this->Push<DrawImageLatticeOp>(
975-
bytes, 1, std::move(image), x_div_count, y_div_count, cell_count, src,
976-
dst, filter, render_with_attributes);
973+
void* pod = this->Push<DrawImageLatticeOp>(bytes, 1, image, x_div_count,
974+
y_div_count, cell_count, src, dst,
975+
filter, render_with_attributes);
977976
CopyV(pod, lattice.fXDivs, x_div_count, lattice.fYDivs, y_div_count,
978977
lattice.fColors, cell_count, lattice.fRectTypes, cell_count);
979978
CheckLayerOpacityCompatibility(render_with_attributes);
@@ -992,22 +991,22 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage> atlas,
992991
if (colors != nullptr) {
993992
bytes += count * sizeof(DlColor);
994993
if (cull_rect != nullptr) {
995-
data_ptr = Push<DrawAtlasCulledOp>(bytes, 1, std::move(atlas), count,
996-
mode, sampling, true, *cull_rect,
997-
render_with_attributes);
994+
data_ptr =
995+
Push<DrawAtlasCulledOp>(bytes, 1, atlas, count, mode, sampling, true,
996+
*cull_rect, render_with_attributes);
998997
} else {
999-
data_ptr = Push<DrawAtlasOp>(bytes, 1, std::move(atlas), count, mode,
1000-
sampling, true, render_with_attributes);
998+
data_ptr = Push<DrawAtlasOp>(bytes, 1, atlas, count, mode, sampling, true,
999+
render_with_attributes);
10011000
}
10021001
CopyV(data_ptr, xform, count, tex, count, colors, count);
10031002
} else {
10041003
if (cull_rect != nullptr) {
1005-
data_ptr = Push<DrawAtlasCulledOp>(bytes, 1, std::move(atlas), count,
1006-
mode, sampling, false, *cull_rect,
1007-
render_with_attributes);
1004+
data_ptr =
1005+
Push<DrawAtlasCulledOp>(bytes, 1, atlas, count, mode, sampling, false,
1006+
*cull_rect, render_with_attributes);
10081007
} else {
1009-
data_ptr = Push<DrawAtlasOp>(bytes, 1, std::move(atlas), count, mode,
1010-
sampling, false, render_with_attributes);
1008+
data_ptr = Push<DrawAtlasOp>(bytes, 1, atlas, count, mode, sampling,
1009+
false, render_with_attributes);
10111010
}
10121011
CopyV(data_ptr, xform, count, tex, count);
10131012
}
@@ -1069,7 +1068,7 @@ void DisplayListBuilder::drawDisplayList(
10691068
void DisplayListBuilder::drawTextBlob(const sk_sp<SkTextBlob> blob,
10701069
SkScalar x,
10711070
SkScalar y) {
1072-
Push<DrawTextBlobOp>(0, 1, std::move(blob), x, y);
1071+
Push<DrawTextBlobOp>(0, 1, blob, x, y);
10731072
CheckLayerOpacityCompatibility();
10741073
}
10751074
void DisplayListBuilder::drawShadow(const SkPath& path,

flow/compositor_context.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ std::unique_ptr<CompositorContext::ScopedFrame> CompositorContext::AcquireFrame(
8181
const SkMatrix& root_surface_transformation,
8282
bool instrumentation_enabled,
8383
bool surface_supports_readback,
84-
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger,
84+
fml::RefPtr<fml::RasterThreadMerger>
85+
raster_thread_merger, // NOLINT(performance-unnecessary-value-param)
8586
DisplayListBuilder* display_list_builder) {
8687
return std::make_unique<ScopedFrame>(
8788
*this, gr_context, canvas, view_embedder, root_surface_transformation,

flow/diff_context.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void DiffContext::AddReadbackRegion(const SkIRect& rect) {
202202
readback.position = rects_->size();
203203
// Push empty rect as a placeholder for position in current subtree
204204
rects_->push_back(SkRect::MakeEmpty());
205-
readbacks_.push_back(std::move(readback));
205+
readbacks_.push_back(readback);
206206
}
207207

208208
PaintRegion DiffContext::CurrentSubtreeRegion() const {

impeller/aiks/aiks_unittests.cc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <cmath>
77
#include <iostream>
88
#include <tuple>
9+
#include <utility>
910

1011
#include "flutter/testing/testing.h"
1112
#include "impeller/aiks/aiks_playground.h"
@@ -74,7 +75,7 @@ TEST_P(AiksTest, CanRenderImage) {
7475
ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
7576
}
7677

77-
bool GenerateMipmap(std::shared_ptr<Context> context,
78+
bool GenerateMipmap(const std::shared_ptr<Context>& context,
7879
std::shared_ptr<Texture> texture,
7980
std::string label) {
8081
auto buffer = context->CreateCommandBuffer();
@@ -85,7 +86,7 @@ bool GenerateMipmap(std::shared_ptr<Context> context,
8586
if (!pass) {
8687
return false;
8788
}
88-
pass->GenerateMipmap(texture, label);
89+
pass->GenerateMipmap(std::move(texture), std::move(label));
8990
pass->EncodeCommands(context->GetResourceAllocator());
9091
return true;
9192
}
@@ -481,8 +482,8 @@ TEST_P(AiksTest, CanRenderLinearGradientWayManyColors) {
481482
colors = std::move(colors)]() {
482483
auto contents = std::make_shared<LinearGradientContents>();
483484
contents->SetEndPoints({0, 0}, {200, 200});
484-
contents->SetColors(std::move(colors));
485-
contents->SetStops(std::move(stops));
485+
contents->SetColors(colors);
486+
contents->SetStops(stops);
486487
contents->SetTileMode(tile_mode);
487488
contents->SetMatrix(matrix);
488489
return contents;
@@ -1077,7 +1078,7 @@ TEST_P(AiksTest, CanRenderDifferencePaths) {
10771078
canvas.DrawImage(
10781079
std::make_shared<Image>(CreateTextureForFixture("boston.jpg")), {10, 10},
10791080
Paint{});
1080-
canvas.DrawPath(std::move(path), paint);
1081+
canvas.DrawPath(path, paint);
10811082

10821083
ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
10831084
}
@@ -1097,7 +1098,7 @@ static sk_sp<SkData> OpenFixtureAsSkData(const char* fixture_name) {
10971098
return data;
10981099
}
10991100

1100-
bool RenderTextInCanvas(std::shared_ptr<Context> context,
1101+
bool RenderTextInCanvas(const std::shared_ptr<Context>& context,
11011102
Canvas& canvas,
11021103
const std::string& text,
11031104
const std::string& font_fixture,
@@ -1129,7 +1130,7 @@ bool RenderTextInCanvas(std::shared_ptr<Context> context,
11291130

11301131
Paint text_paint;
11311132
text_paint.color = Color::Yellow();
1132-
canvas.DrawTextFrame(std::move(frame), text_position, text_paint);
1133+
canvas.DrawTextFrame(frame, text_position, text_paint);
11331134
return true;
11341135
}
11351136

@@ -1725,7 +1726,7 @@ TEST_P(AiksTest, SaveLayerFiltersScaleWithTransform) {
17251726
canvas.Translate(Vector2(100, 100));
17261727

17271728
auto texture = std::make_shared<Image>(CreateTextureForFixture("boston.jpg"));
1728-
auto draw_image_layer = [&canvas, &texture](Paint paint) {
1729+
auto draw_image_layer = [&canvas, &texture](const Paint& paint) {
17291730
canvas.SaveLayer(paint);
17301731
canvas.DrawImage(texture, {}, Paint{});
17311732
canvas.Restore();

0 commit comments

Comments
 (0)