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

Commit 1850def

Browse files
jason-simmonsjason-simmons
authored
Manual roll of Clang from 725656bdd885 to 145176dc0c93 (#52823)
See flutter/flutter#143178
1 parent 6fa734d commit 1850def

File tree

74 files changed

+297
-297
lines changed

Some content is hidden

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

74 files changed

+297
-297
lines changed

‎DEPS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ vars = {
4242
# updates to Clang Tidy will not turn the tree red.
4343
#
4444
# See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
45-
'clang_version': 'git_revision:725656bdd885483c39f482a01ea25d67acf39c46',
45+
'clang_version': 'git_revision:145176dc0c93566ce4aef721044d49ab8ba50f87',
4646

4747
'reclient_version': 'git_revision:29a9d3cb597b6a7d67fa3e9aa8a7cab1c81232ee',
4848

@@ -943,7 +943,7 @@ deps = {
943943
'packages': [
944944
{
945945
'package': 'flutter_internal/rbe/reclient_cfgs',
946-
'version': 'XIomtC8MFuQrF9qI5xYcFfcfKXZTbcY6nL6NgF-pSRIC',
946+
'version': '_crQLRWl_tm9uDdPtihkx_9vvdMe-OYBdQ0_ih51y7QC',
947947
}
948948
],
949949
'condition': 'use_rbe',

‎ci/licenses_golden/excluded_files‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@
271271
../../../flutter/shell/common/variable_refresh_rate_display_unittests.cc
272272
../../../flutter/shell/common/vsync_waiter_unittests.cc
273273
../../../flutter/shell/gpu/gpu_surface_metal_impeller_unittests.mm
274+
../../../flutter/shell/platform/.clang-tidy
274275
../../../flutter/shell/platform/android/.gitignore
275276
../../../flutter/shell/platform/android/README.md
276277
../../../flutter/shell/platform/android/android_context_gl_impeller_unittests.cc
@@ -366,7 +367,6 @@
366367
../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_unittests.cc
367368
../../../flutter/shell/platform/glfw/client_wrapper/plugin_registrar_glfw_unittests.cc
368369
../../../flutter/shell/platform/glfw/client_wrapper/testing
369-
../../../flutter/shell/platform/linux/.clang-tidy
370370
../../../flutter/shell/platform/linux/testing
371371
../../../flutter/shell/platform/windows/README.md
372372
../../../flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc

‎common/graphics/gl_context_switch.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ GLContextResult::GLContextResult() = default;
1414

1515
GLContextResult::~GLContextResult() = default;
1616

17-
GLContextResult::GLContextResult(bool static_result) : result_(static_result){};
17+
GLContextResult::GLContextResult(bool static_result)
18+
: result_(static_result) {};
1819

1920
bool GLContextResult::GetResult() {
2021
return result_;
2122
};
2223

2324
GLContextDefaultResult::GLContextDefaultResult(bool static_result)
24-
: GLContextResult(static_result){};
25+
: GLContextResult(static_result) {};
2526

2627
GLContextDefaultResult::~GLContextDefaultResult() = default;
2728

‎display_list/display_list_unittests.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2314,7 +2314,9 @@ TEST_F(DisplayListTest, RemoveUnnecessarySaveRestorePairs) {
23142314
receiver2.drawRect({10, 10, 20, 20});
23152315
receiver2.save();
23162316
receiver2.translate(1.0, 1.0);
2317-
{ receiver2.drawRect({50, 50, 60, 60}); }
2317+
{
2318+
receiver2.drawRect({50, 50, 60, 60});
2319+
}
23182320
receiver2.restore();
23192321
ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), builder2.Build()));
23202322
}

‎display_list/effects/dl_runtime_effect.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ DlRuntimeEffectImpeller::~DlRuntimeEffectImpeller() = default;
5252

5353
DlRuntimeEffectImpeller::DlRuntimeEffectImpeller(
5454
std::shared_ptr<impeller::RuntimeStage> runtime_stage)
55-
: runtime_stage_(std::move(runtime_stage)){};
55+
: runtime_stage_(std::move(runtime_stage)) {};
5656

5757
sk_sp<SkRuntimeEffect> DlRuntimeEffectImpeller::skia_runtime_effect() const {
5858
return nullptr;

‎display_list/testing/dl_rendering_unittests.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,8 +2233,8 @@ class CanvasCompareTester {
22332233
return DirectoryStatus::kCreated;
22342234
}
22352235
FML_LOG(ERROR) << "Could not create directory (" << dir
2236-
<< ") for impeller failure images" << ", ret = " << ret.get()
2237-
<< ", errno = " << errno;
2236+
<< ") for impeller failure images"
2237+
<< ", ret = " << ret.get() << ", errno = " << errno;
22382238
return DirectoryStatus::kFailed;
22392239
}
22402240

‎display_list/testing/dl_test_snippets.cc‎

Lines changed: 15 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -517,75 +517,30 @@ std::vector<DisplayListInvocationGroup> CreateAllRenderingOps() {
517517
}},
518518
{"DrawLine",
519519
{
520-
{1, 24, 1,
521-
[](DlOpReceiver& r) {
522-
r.drawLine({0, 0}, {10, 10});
523-
}},
524-
{1, 24, 1,
525-
[](DlOpReceiver& r) {
526-
r.drawLine({0, 1}, {10, 10});
527-
}},
528-
{1, 24, 1,
529-
[](DlOpReceiver& r) {
530-
r.drawLine({0, 0}, {20, 10});
531-
}},
532-
{1, 24, 1,
533-
[](DlOpReceiver& r) {
534-
r.drawLine({0, 0}, {10, 20});
535-
}},
520+
{1, 24, 1, [](DlOpReceiver& r) { r.drawLine({0, 0}, {10, 10}); }},
521+
{1, 24, 1, [](DlOpReceiver& r) { r.drawLine({0, 1}, {10, 10}); }},
522+
{1, 24, 1, [](DlOpReceiver& r) { r.drawLine({0, 0}, {20, 10}); }},
523+
{1, 24, 1, [](DlOpReceiver& r) { r.drawLine({0, 0}, {10, 20}); }},
536524
}},
537525
{"DrawRect",
538526
{
539-
{1, 24, 1,
540-
[](DlOpReceiver& r) {
541-
r.drawRect({0, 0, 10, 10});
542-
}},
543-
{1, 24, 1,
544-
[](DlOpReceiver& r) {
545-
r.drawRect({0, 1, 10, 10});
546-
}},
547-
{1, 24, 1,
548-
[](DlOpReceiver& r) {
549-
r.drawRect({0, 0, 20, 10});
550-
}},
551-
{1, 24, 1,
552-
[](DlOpReceiver& r) {
553-
r.drawRect({0, 0, 10, 20});
554-
}},
527+
{1, 24, 1, [](DlOpReceiver& r) { r.drawRect({0, 0, 10, 10}); }},
528+
{1, 24, 1, [](DlOpReceiver& r) { r.drawRect({0, 1, 10, 10}); }},
529+
{1, 24, 1, [](DlOpReceiver& r) { r.drawRect({0, 0, 20, 10}); }},
530+
{1, 24, 1, [](DlOpReceiver& r) { r.drawRect({0, 0, 10, 20}); }},
555531
}},
556532
{"DrawOval",
557533
{
558-
{1, 24, 1,
559-
[](DlOpReceiver& r) {
560-
r.drawOval({0, 0, 10, 10});
561-
}},
562-
{1, 24, 1,
563-
[](DlOpReceiver& r) {
564-
r.drawOval({0, 1, 10, 10});
565-
}},
566-
{1, 24, 1,
567-
[](DlOpReceiver& r) {
568-
r.drawOval({0, 0, 20, 10});
569-
}},
570-
{1, 24, 1,
571-
[](DlOpReceiver& r) {
572-
r.drawOval({0, 0, 10, 20});
573-
}},
534+
{1, 24, 1, [](DlOpReceiver& r) { r.drawOval({0, 0, 10, 10}); }},
535+
{1, 24, 1, [](DlOpReceiver& r) { r.drawOval({0, 1, 10, 10}); }},
536+
{1, 24, 1, [](DlOpReceiver& r) { r.drawOval({0, 0, 20, 10}); }},
537+
{1, 24, 1, [](DlOpReceiver& r) { r.drawOval({0, 0, 10, 20}); }},
574538
}},
575539
{"DrawCircle",
576540
{
577-
{1, 16, 1,
578-
[](DlOpReceiver& r) {
579-
r.drawCircle({0, 0}, 10);
580-
}},
581-
{1, 16, 1,
582-
[](DlOpReceiver& r) {
583-
r.drawCircle({0, 5}, 10);
584-
}},
585-
{1, 16, 1,
586-
[](DlOpReceiver& r) {
587-
r.drawCircle({0, 0}, 20);
588-
}},
541+
{1, 16, 1, [](DlOpReceiver& r) { r.drawCircle({0, 0}, 10); }},
542+
{1, 16, 1, [](DlOpReceiver& r) { r.drawCircle({0, 5}, 10); }},
543+
{1, 16, 1, [](DlOpReceiver& r) { r.drawCircle({0, 0}, 20); }},
589544
}},
590545
{"DrawRRect",
591546
{

‎flow/layers/performance_overlay_layer.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ sk_sp<SkTextBlob> PerformanceOverlayLayer::MakeStatisticsText(
9595
std::stringstream stream;
9696
stream.setf(std::ios::fixed | std::ios::showpoint);
9797
stream << std::setprecision(1);
98-
stream << label_prefix << " " << "max " << max_ms_per_frame << " ms/frame, "
98+
stream << label_prefix << " "
99+
<< "max " << max_ms_per_frame << " ms/frame, "
99100
<< "avg " << average_ms_per_frame << " ms/frame";
100101
auto text = stream.str();
101102
return SkTextBlob::MakeFromText(text.c_str(), text.size(), font,

‎flow/layers/performance_overlay_layer_unittests.cc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ static std::string GetGoldenFilePath(int refresh_rate, bool is_new) {
3838
std::stringstream ss;
3939
// This unit test should only be run on Linux (not even on Mac since it's a
4040
// golden test). Hence we don't have to worry about the "/" vs. "\".
41-
ss << flutter::GetGoldenDir() << "/" << "performance_overlay_gold_"
42-
<< refresh_rate << "fps" << (is_new ? "_new" : "") << ".png";
41+
ss << flutter::GetGoldenDir() << "/"
42+
<< "performance_overlay_gold_" << refresh_rate << "fps"
43+
<< (is_new ? "_new" : "") << ".png";
4344
return ss.str();
4445
}
4546

@@ -117,9 +118,9 @@ static void TestPerformanceOverlayLayerGold(int refresh_rate) {
117118
b64_char[b64_size] = 0; // make it null terminated for printing
118119

119120
EXPECT_TRUE(golden_data_matches)
120-
<< "Golden file mismatch. Please check " << "the difference between "
121-
<< golden_file_path << " and " << new_golden_file_path
122-
<< ", and replace the former "
121+
<< "Golden file mismatch. Please check "
122+
<< "the difference between " << golden_file_path << " and "
123+
<< new_golden_file_path << ", and replace the former "
123124
<< "with the latter if the difference looks good.\nS\n"
124125
<< "See also the base64 encoded " << new_golden_file_path << ":\n"
125126
<< b64_char;

‎flow/testing/gl_context_switch_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace testing {
1010
static thread_local std::unique_ptr<int> current_context;
1111

1212
TestSwitchableGLContext::TestSwitchableGLContext(int context)
13-
: context_(context){};
13+
: context_(context) {};
1414

1515
TestSwitchableGLContext::~TestSwitchableGLContext() = default;
1616

0 commit comments

Comments
 (0)