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

Commit cd12d34

Browse files
knoppknopp
committed
Rename num_rects -> rects_count
1 parent 1a68c30 commit cd12d34

File tree

7 files changed

+48
-48
lines changed

7 files changed

+48
-48
lines changed

‎shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
if (present_info != nullptr && present_info->paint_region != nullptr) {
6262
auto paint_region = present_info->paint_region;
6363
info.paintRegion = std::vector<FlutterRect>(
64-
paint_region->rects, paint_region->rects + paint_region->num_rects);
64+
paint_region->rects, paint_region->rects + paint_region->rects_count);
6565
}
6666
[surfaces addObject:info];
6767
}

‎shell/platform/embedder/embedder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ typedef struct {
15721572
/// The size of this struct. Must be sizeof(FlutterRegion).
15731573
size_t struct_size;
15741574
/// Number of rectangles in the region.
1575-
size_t num_rects;
1575+
size_t rects_count;
15761576
/// The rectangles that make up the region.
15771577
FlutterRect* rects;
15781578
} FlutterRegion;

‎shell/platform/embedder/embedder_layers.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void EmbedderLayers::PushBackingStoreLayer(
5454
auto paint_region = std::make_unique<FlutterRegion>();
5555
paint_region->struct_size = sizeof(FlutterRegion);
5656
paint_region->rects = paint_region_rects->data();
57-
paint_region->num_rects = paint_region_rects->size();
57+
paint_region->rects_count = paint_region_rects->size();
5858
rects_referenced_.push_back(std::move(paint_region_rects));
5959

6060
auto present_info = std::make_unique<FlutterBackingStorePresentInfo>();

‎shell/platform/embedder/tests/embedder_assertions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ inline bool operator==(const FlutterSoftwareBackingStore2& a,
117117
}
118118

119119
inline bool operator==(const FlutterRegion& a, const FlutterRegion& b) {
120-
if (a.struct_size == b.struct_size && a.num_rects == b.num_rects) {
121-
for (size_t i = 0; i < a.num_rects; i++) {
120+
if (a.struct_size == b.struct_size && a.rects_count == b.rects_count) {
121+
for (size_t i = 0; i < a.rects_count; i++) {
122122
if (!(a.rects[i] == b.rects[i])) {
123123
return false;
124124
}

‎shell/platform/embedder/tests/embedder_gl_unittests.cc

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLFramebuffer) {
108108
};
109109
FlutterRegion paint_region = {
110110
.struct_size = sizeof(FlutterRegion),
111-
.num_rects = 1,
111+
.rects_count = 1,
112112
.rects = paint_region_rects,
113113
};
114114
FlutterBackingStorePresentInfo present_info = {
@@ -154,7 +154,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLFramebuffer) {
154154
};
155155
FlutterRegion paint_region = {
156156
.struct_size = sizeof(FlutterRegion),
157-
.num_rects = 1,
157+
.rects_count = 1,
158158
.rects = paint_region_rects,
159159
};
160160
FlutterBackingStorePresentInfo present_info = {
@@ -229,7 +229,7 @@ TEST_F(EmbedderTest, RasterCacheDisabledWithPlatformViews) {
229229
};
230230
FlutterRegion paint_region = {
231231
.struct_size = sizeof(FlutterRegion),
232-
.num_rects = 1,
232+
.rects_count = 1,
233233
.rects = paint_region_rects,
234234
};
235235
FlutterBackingStorePresentInfo present_info = {
@@ -275,7 +275,7 @@ TEST_F(EmbedderTest, RasterCacheDisabledWithPlatformViews) {
275275
};
276276
FlutterRegion paint_region = {
277277
.struct_size = sizeof(FlutterRegion),
278-
.num_rects = 1,
278+
.rects_count = 1,
279279
.rects = paint_region_rects,
280280
};
281281
FlutterBackingStorePresentInfo present_info = {
@@ -361,7 +361,7 @@ TEST_F(EmbedderTest, RasterCacheEnabled) {
361361
};
362362
FlutterRegion paint_region = {
363363
.struct_size = sizeof(FlutterRegion),
364-
.num_rects = 1,
364+
.rects_count = 1,
365365
.rects = paint_region_rects,
366366
};
367367
FlutterBackingStorePresentInfo present_info = {
@@ -444,7 +444,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLTexture) {
444444
};
445445
FlutterRegion paint_region = {
446446
.struct_size = sizeof(FlutterRegion),
447-
.num_rects = 1,
447+
.rects_count = 1,
448448
.rects = paint_region_rects,
449449
};
450450
FlutterBackingStorePresentInfo present_info = {
@@ -490,7 +490,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLTexture) {
490490
};
491491
FlutterRegion paint_region = {
492492
.struct_size = sizeof(FlutterRegion),
493-
.num_rects = 1,
493+
.rects_count = 1,
494494
.rects = paint_region_rects,
495495
};
496496
FlutterBackingStorePresentInfo present_info = {
@@ -566,7 +566,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToSoftwareBuffer) {
566566
};
567567
FlutterRegion paint_region = {
568568
.struct_size = sizeof(FlutterRegion),
569-
.num_rects = 1,
569+
.rects_count = 1,
570570
.rects = paint_region_rects,
571571
};
572572
FlutterBackingStorePresentInfo present_info = {
@@ -611,7 +611,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToSoftwareBuffer) {
611611
};
612612
FlutterRegion paint_region = {
613613
.struct_size = sizeof(FlutterRegion),
614-
.num_rects = 1,
614+
.rects_count = 1,
615615
.rects = paint_region_rects,
616616
};
617617
FlutterBackingStorePresentInfo present_info = {
@@ -687,7 +687,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
687687
};
688688
FlutterRegion paint_region = {
689689
.struct_size = sizeof(FlutterRegion),
690-
.num_rects = 1,
690+
.rects_count = 1,
691691
.rects = paint_region_rects,
692692
};
693693
FlutterBackingStorePresentInfo present_info = {
@@ -734,7 +734,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
734734
};
735735
FlutterRegion paint_region = {
736736
.struct_size = sizeof(FlutterRegion),
737-
.num_rects = 1,
737+
.rects_count = 1,
738738
.rects = paint_region_rects,
739739
};
740740
FlutterBackingStorePresentInfo present_info = {
@@ -781,7 +781,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
781781
};
782782
FlutterRegion paint_region = {
783783
.struct_size = sizeof(FlutterRegion),
784-
.num_rects = 1,
784+
.rects_count = 1,
785785
.rects = paint_region_rects,
786786
};
787787
FlutterBackingStorePresentInfo present_info = {
@@ -912,7 +912,7 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
912912
};
913913
FlutterRegion paint_region = {
914914
.struct_size = sizeof(FlutterRegion),
915-
.num_rects = 1,
915+
.rects_count = 1,
916916
.rects = paint_region_rects,
917917
};
918918
FlutterBackingStorePresentInfo present_info = {
@@ -941,7 +941,7 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
941941
};
942942
FlutterRegion paint_region = {
943943
.struct_size = sizeof(FlutterRegion),
944-
.num_rects = 1,
944+
.rects_count = 1,
945945
.rects = paint_region_rects,
946946
};
947947
FlutterBackingStorePresentInfo present_info = {
@@ -972,7 +972,7 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
972972
};
973973
FlutterRegion paint_region = {
974974
.struct_size = sizeof(FlutterRegion),
975-
.num_rects = 1,
975+
.rects_count = 1,
976976
.rects = paint_region_rects,
977977
};
978978
FlutterBackingStorePresentInfo present_info = {
@@ -1068,7 +1068,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithRootLayerOnly) {
10681068
};
10691069
FlutterRegion paint_region = {
10701070
.struct_size = sizeof(FlutterRegion),
1071-
.num_rects = 1,
1071+
.rects_count = 1,
10721072
.rects = paint_region_rects,
10731073
};
10741074
FlutterBackingStorePresentInfo present_info = {
@@ -1149,7 +1149,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithPlatformLayerOnBottom) {
11491149
};
11501150
FlutterRegion paint_region = {
11511151
.struct_size = sizeof(FlutterRegion),
1152-
.num_rects = 1,
1152+
.rects_count = 1,
11531153
.rects = paint_region_rects,
11541154
};
11551155
FlutterBackingStorePresentInfo present_info = {
@@ -1283,7 +1283,7 @@ TEST_F(EmbedderTest,
12831283
};
12841284
FlutterRegion paint_region = {
12851285
.struct_size = sizeof(FlutterRegion),
1286-
.num_rects = 1,
1286+
.rects_count = 1,
12871287
.rects = paint_region_rects,
12881288
};
12891289
FlutterBackingStorePresentInfo present_info = {
@@ -1330,7 +1330,7 @@ TEST_F(EmbedderTest,
13301330
};
13311331
FlutterRegion paint_region = {
13321332
.struct_size = sizeof(FlutterRegion),
1333-
.num_rects = 1,
1333+
.rects_count = 1,
13341334
.rects = paint_region_rects,
13351335
};
13361336
FlutterBackingStorePresentInfo present_info = {
@@ -1377,7 +1377,7 @@ TEST_F(EmbedderTest,
13771377
};
13781378
FlutterRegion paint_region = {
13791379
.struct_size = sizeof(FlutterRegion),
1380-
.num_rects = 1,
1380+
.rects_count = 1,
13811381
.rects = paint_region_rects,
13821382
};
13831383
FlutterBackingStorePresentInfo present_info = {
@@ -1672,7 +1672,7 @@ TEST_P(EmbedderTestMultiBackend,
16721672
};
16731673
FlutterRegion paint_region = {
16741674
.struct_size = sizeof(FlutterRegion),
1675-
.num_rects = 1,
1675+
.rects_count = 1,
16761676
.rects = paint_region_rects,
16771677
};
16781678
FlutterBackingStorePresentInfo present_info = {
@@ -1718,7 +1718,7 @@ TEST_P(EmbedderTestMultiBackend,
17181718
};
17191719
FlutterRegion paint_region = {
17201720
.struct_size = sizeof(FlutterRegion),
1721-
.num_rects = 1,
1721+
.rects_count = 1,
17221722
.rects = paint_region_rects,
17231723
};
17241724
FlutterBackingStorePresentInfo present_info = {
@@ -1813,7 +1813,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
18131813
};
18141814
FlutterRegion paint_region = {
18151815
.struct_size = sizeof(FlutterRegion),
1816-
.num_rects = 1,
1816+
.rects_count = 1,
18171817
.rects = paint_region_rects,
18181818
};
18191819
FlutterBackingStorePresentInfo present_info = {
@@ -1860,7 +1860,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
18601860
};
18611861
FlutterRegion paint_region = {
18621862
.struct_size = sizeof(FlutterRegion),
1863-
.num_rects = 1,
1863+
.rects_count = 1,
18641864
.rects = paint_region_rects,
18651865
};
18661866
FlutterBackingStorePresentInfo present_info = {
@@ -2184,7 +2184,7 @@ TEST_P(EmbedderTestMultiBackend,
21842184
};
21852185
FlutterRegion paint_region = {
21862186
.struct_size = sizeof(FlutterRegion),
2187-
.num_rects = 1,
2187+
.rects_count = 1,
21882188
.rects = paint_region_rects,
21892189
};
21902190
FlutterBackingStorePresentInfo present_info = {
@@ -2230,7 +2230,7 @@ TEST_P(EmbedderTestMultiBackend,
22302230
};
22312231
FlutterRegion paint_region = {
22322232
.struct_size = sizeof(FlutterRegion),
2233-
.num_rects = 1,
2233+
.rects_count = 1,
22342234
.rects = paint_region_rects,
22352235
};
22362236
FlutterBackingStorePresentInfo present_info = {
@@ -2307,7 +2307,7 @@ TEST_F(
23072307
};
23082308
FlutterRegion paint_region = {
23092309
.struct_size = sizeof(FlutterRegion),
2310-
.num_rects = 1,
2310+
.rects_count = 1,
23112311
.rects = paint_region_rects,
23122312
};
23132313
FlutterBackingStorePresentInfo present_info = {
@@ -2354,7 +2354,7 @@ TEST_F(
23542354
};
23552355
FlutterRegion paint_region = {
23562356
.struct_size = sizeof(FlutterRegion),
2357-
.num_rects = 1,
2357+
.rects_count = 1,
23582358
.rects = paint_region_rects,
23592359
};
23602360
FlutterBackingStorePresentInfo present_info = {
@@ -2504,7 +2504,7 @@ TEST_P(EmbedderTestMultiBackend, PlatformViewMutatorsAreValid) {
25042504
};
25052505
FlutterRegion paint_region = {
25062506
.struct_size = sizeof(FlutterRegion),
2507-
.num_rects = 1,
2507+
.rects_count = 1,
25082508
.rects = paint_region_rects,
25092509
};
25102510
FlutterBackingStorePresentInfo present_info = {
@@ -2614,7 +2614,7 @@ TEST_F(EmbedderTest, PlatformViewMutatorsAreValidWithPixelRatio) {
26142614
};
26152615
FlutterRegion paint_region = {
26162616
.struct_size = sizeof(FlutterRegion),
2617-
.num_rects = 1,
2617+
.rects_count = 1,
26182618
.rects = paint_region_rects,
26192619
};
26202620
FlutterBackingStorePresentInfo present_info = {
@@ -2730,7 +2730,7 @@ TEST_F(EmbedderTest,
27302730
};
27312731
FlutterRegion paint_region = {
27322732
.struct_size = sizeof(FlutterRegion),
2733-
.num_rects = 1,
2733+
.rects_count = 1,
27342734
.rects = paint_region_rects,
27352735
};
27362736
FlutterBackingStorePresentInfo present_info = {

‎shell/platform/embedder/tests/embedder_metal_unittests.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ GrBackendTexture backend_texture(texture_size.width(), texture_size.height(), Gr
151151
};
152152
FlutterRegion paint_region = {
153153
.struct_size = sizeof(FlutterRegion),
154-
.num_rects = 1,
154+
.rects_count = 1,
155155
.rects = paint_region_rects,
156156
};
157157
FlutterBackingStorePresentInfo present_info = {
@@ -196,7 +196,7 @@ GrBackendTexture backend_texture(texture_size.width(), texture_size.height(), Gr
196196
};
197197
FlutterRegion paint_region = {
198198
.struct_size = sizeof(FlutterRegion),
199-
.num_rects = 1,
199+
.rects_count = 1,
200200
.rects = paint_region_rects,
201201
};
202202
FlutterBackingStorePresentInfo present_info = {
@@ -339,7 +339,7 @@ GrBackendTexture backend_texture(texture_size.width(), texture_size.height(), Gr
339339
};
340340
FlutterRegion paint_region = {
341341
.struct_size = sizeof(FlutterRegion),
342-
.num_rects = 1,
342+
.rects_count = 1,
343343
.rects = paint_region_rects,
344344
};
345345
FlutterBackingStorePresentInfo present_info = {
@@ -385,7 +385,7 @@ GrBackendTexture backend_texture(texture_size.width(), texture_size.height(), Gr
385385
};
386386
FlutterRegion paint_region = {
387387
.struct_size = sizeof(FlutterRegion),
388-
.num_rects = 1,
388+
.rects_count = 1,
389389
.rects = paint_region_rects,
390390
};
391391
FlutterBackingStorePresentInfo present_info = {
@@ -431,7 +431,7 @@ GrBackendTexture backend_texture(texture_size.width(), texture_size.height(), Gr
431431
};
432432
FlutterRegion paint_region = {
433433
.struct_size = sizeof(FlutterRegion),
434-
.num_rects = 1,
434+
.rects_count = 1,
435435
.rects = paint_region_rects,
436436
};
437437
FlutterBackingStorePresentInfo present_info = {

0 commit comments

Comments
 (0)