Skip to content

Commit db8a0a4

Browse files
fix benchmark ci warnings
1 parent 1b4ea5b commit db8a0a4

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

yoga/algorithm/grid/GridLayout.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ void calculateGridLayoutInternal(Node* node,
254254
for (auto& item : itemAreas) {
255255
auto [containingBlockWidth, containingBlockHeight] = trackSizing.getContainingBlockSizeForItem(item);
256256
float gridAreaLeft = 0.0f;
257-
for (size_t i = 0; i < item.columnStart && i < columnTracks.size(); i++) {
257+
for (size_t i = 0; i < static_cast<size_t>(item.columnStart) && i < columnTracks.size(); i++) {
258258
gridAreaLeft += columnTracks[i].baseSize;
259259
if (i < columnTracks.size() - 1) {
260260
// Add both explicit gap and content-distribution spacing
@@ -263,7 +263,7 @@ void calculateGridLayoutInternal(Node* node,
263263
}
264264

265265
float gridAreaTop = 0.0f;
266-
for (size_t i = 0; i < item.rowStart && i < rowTracks.size(); i++) {
266+
for (size_t i = 0; i < static_cast<size_t>(item.rowStart) && i < rowTracks.size(); i++) {
267267
gridAreaTop += rowTracks[i].baseSize;
268268
if (i < rowTracks.size() - 1) {
269269
// Add both explicit gap and content-distribution spacing
@@ -451,13 +451,13 @@ GridTracks createGridTracks(yoga::Node* node, const AutoPlacement& autoPlacement
451451
columnTracks.push_back(autoColumnTrack);
452452
}
453453

454-
for (auto i = 0; i < gridExplicitColumns.size(); i++) {
454+
for (size_t i = 0; i < gridExplicitColumns.size(); i++) {
455455
columnTracks.push_back(gridExplicitColumns[i]);
456456
}
457457

458458
// The first track after the last explicitly-sized track receives the first specified size
459459
// i.e. the pattern repeats forwards
460-
for (auto i = 0; i < autoPlacement.maxColumnEnd - gridExplicitColumns.size(); i++) {
460+
for (size_t i = 0; i < static_cast<size_t>(autoPlacement.maxColumnEnd) - gridExplicitColumns.size(); i++) {
461461
auto autoColumnTrack = autoColumnTracks[i % autoColumnTracksSize];
462462
columnTracks.push_back(autoColumnTrack);
463463
}
@@ -469,10 +469,10 @@ GridTracks createGridTracks(yoga::Node* node, const AutoPlacement& autoPlacement
469469
auto autoRowTrack = autoRowTracks[autoRowTracksSize - currentRowTrackIndex - 1];
470470
rowTracks.push_back(autoRowTrack);
471471
}
472-
for (auto i = 0; i < gridExplicitRows.size(); i++) {
472+
for (size_t i = 0; i < gridExplicitRows.size(); i++) {
473473
rowTracks.push_back(gridExplicitRows[i]);
474474
}
475-
for (auto i = 0; i < autoPlacement.maxRowEnd - gridExplicitRows.size(); i++) {
475+
for (size_t i = 0; i < static_cast<size_t>(autoPlacement.maxRowEnd) - gridExplicitRows.size(); i++) {
476476
auto autoRowTrack = autoRowTracks[i % autoRowTracksSize];
477477
rowTracks.push_back(autoRowTrack);
478478
}

yoga/algorithm/grid/TrackSizing.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,19 +1276,19 @@ struct TrackSizing {
12761276
auto rowGap = node->style().computeGapForDimension(Dimension::Height, containerInnerHeight);
12771277

12781278
// Calculate width: sum of spanned column tracks + gaps
1279-
for (int i = item.columnStart; i < item.columnEnd && i < (int)columnTracks.size(); i++) {
1279+
for (size_t i = item.columnStart; i < static_cast<size_t>(item.columnEnd) && i < columnTracks.size(); i++) {
12801280
containingBlockWidth += columnTracks[i].baseSize;
12811281
// Add column gap if not the last spanned track
1282-
if (i < item.columnEnd - 1) {
1282+
if (i < static_cast<size_t>(item.columnEnd - 1)) {
12831283
containingBlockWidth += columnGap;
12841284
}
12851285
}
12861286

12871287
// Calculate height: sum of spanned row tracks + gaps
1288-
for (int i = item.rowStart; i < item.rowEnd && i < (int)rowTracks.size(); i++) {
1288+
for (size_t i = item.rowStart; i < static_cast<size_t>(item.rowEnd) && i < rowTracks.size(); i++) {
12891289
containingBlockHeight += rowTracks[i].baseSize;
12901290
// Add row gap if not the last spanned track
1291-
if (i < item.rowEnd - 1) {
1291+
if (i < static_cast<size_t>(item.rowEnd - 1)) {
12921292
containingBlockHeight += rowGap;
12931293
}
12941294
}
@@ -1306,10 +1306,10 @@ struct TrackSizing {
13061306
auto rowGap = node->style().computeGapForDimension(Dimension::Height, containerInnerHeight);
13071307
auto columnGap = node->style().computeGapForDimension(Dimension::Width, containerInnerWidth);
13081308

1309-
for (size_t i = item.rowStart; i < item.rowEnd && i < rowTracks.size(); i++) {
1309+
for (size_t i = item.rowStart; i < static_cast<size_t>(item.rowEnd) && i < rowTracks.size(); i++) {
13101310
if (isFixedSizingFunction(rowTracks[i].maxSizingFunction, containerInnerHeight)) {
13111311
containingBlockHeight += rowTracks[i].maxSizingFunction.resolve(containerInnerHeight).unwrap();
1312-
if (i < item.rowEnd - 1) {
1312+
if (i < static_cast<size_t>(item.rowEnd - 1)) {
13131313
containingBlockHeight += rowGap;
13141314
}
13151315
} else {
@@ -1321,10 +1321,10 @@ struct TrackSizing {
13211321
// In trackSizing columnTracks
13221322
// If calculating the layout of a grid item in this step depends on the available space in the block axis, assume the available space that it would have if any row with a definite max track sizing function had that size and all other rows were infinite.
13231323
if (dimension == Dimension::Width) {
1324-
for (size_t i = item.columnStart; i < item.columnEnd && i < columnTracks.size(); i++) {
1324+
for (size_t i = item.columnStart; i < static_cast<size_t>(item.columnEnd) && i < columnTracks.size(); i++) {
13251325
if (isFixedSizingFunction(columnTracks[i].maxSizingFunction, containerInnerWidth)) {
13261326
containingBlockWidth += columnTracks[i].maxSizingFunction.resolve(containerInnerWidth).unwrap();
1327-
if (i < item.columnEnd - 1) {
1327+
if (i < static_cast<size_t>(item.columnEnd - 1)) {
13281328
containingBlockWidth += columnGap;
13291329
}
13301330
} else {
@@ -1336,9 +1336,9 @@ struct TrackSizing {
13361336
// In trackSizing rowTracks
13371337
// To find the inline-axis available space for any items whose block-axis size contributions require it, use the grid column sizes calculated in the previous step. If the grid container’s inline size is definite, also apply justify-content to account for the effective column gap sizes.
13381338
else if (dimension == Dimension::Height) {
1339-
for (size_t i = item.columnStart; i < item.columnEnd && i < columnTracks.size(); i++) {
1339+
for (size_t i = item.columnStart; i < static_cast<size_t>(item.columnEnd) && i < columnTracks.size(); i++) {
13401340
containingBlockWidth += columnTracks[i].baseSize;
1341-
if (i < item.columnEnd - 1) {
1341+
if (i < static_cast<size_t>(item.columnEnd - 1)) {
13421342
containingBlockWidth += columnGap;
13431343
}
13441344
}

0 commit comments

Comments
 (0)