Skip to content

Commit 84312c5

Browse files
joevilchesfacebook-github-bot
authored andcommitted
Camel case *AxisownerSize (#1714)
Summary: X-link: facebook/react-native#46744 Pull Request resolved: #1714 This was annoying me :) Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D63424778 fbshipit-source-id: 8f9df4e92bde251214f4c1d61ff8282d56f87816
1 parent dc1f0a6 commit 84312c5

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

yoga/algorithm/CalculateLayout.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ static void computeFlexBasisForChild(
8080
resolveDirection(node->style().flexDirection(), direction);
8181
const bool isMainAxisRow = isRow(mainAxis);
8282
const float mainAxisSize = isMainAxisRow ? width : height;
83-
const float mainAxisownerSize = isMainAxisRow ? ownerWidth : ownerHeight;
83+
const float mainAxisOwnerSize = isMainAxisRow ? ownerWidth : ownerHeight;
8484

8585
float childWidth = YGUndefined;
8686
float childHeight = YGUndefined;
8787
SizingMode childWidthSizingMode;
8888
SizingMode childHeightSizingMode;
8989

9090
const FloatOptional resolvedFlexBasis =
91-
child->resolveFlexBasis(direction, mainAxis, mainAxisownerSize);
91+
child->resolveFlexBasis(direction, mainAxis, mainAxisOwnerSize);
9292
const bool isRowStyleDimDefined =
9393
child->hasDefiniteLength(Dimension::Width, ownerWidth);
9494
const bool isColumnStyleDimDefined =
@@ -594,7 +594,7 @@ static float distributeFreeSpaceSecondPass(
594594
const FlexDirection mainAxis,
595595
const FlexDirection crossAxis,
596596
const Direction direction,
597-
const float mainAxisownerSize,
597+
const float mainAxisOwnerSize,
598598
const float availableInnerMainDim,
599599
const float availableInnerCrossDim,
600600
const float availableInnerWidth,
@@ -618,7 +618,7 @@ static float distributeFreeSpaceSecondPass(
618618
direction,
619619
mainAxis,
620620
currentLineChild->getLayout().computedFlexBasis,
621-
mainAxisownerSize)
621+
mainAxisOwnerSize)
622622
.unwrap();
623623
float updatedMainSize = childFlexBasis;
624624

@@ -670,8 +670,8 @@ static float distributeFreeSpaceSecondPass(
670670
yoga::assertFatalWithNode(
671671
currentLineChild,
672672
yoga::isDefined(updatedMainSize),
673-
("updatedMainSize is undefined. mainAxisownerSize: " +
674-
std::to_string(mainAxisownerSize))
673+
("updatedMainSize is undefined. mainAxisOwnerSize: " +
674+
std::to_string(mainAxisOwnerSize))
675675
.c_str());
676676

677677
deltaFreeSpace += updatedMainSize - childFlexBasis;
@@ -808,7 +808,7 @@ static void distributeFreeSpaceFirstPass(
808808
FlexLine& flexLine,
809809
const Direction direction,
810810
const FlexDirection mainAxis,
811-
const float mainAxisownerSize,
811+
const float mainAxisOwnerSize,
812812
const float availableInnerMainDim,
813813
const float availableInnerWidth) {
814814
float flexShrinkScaledFactor = 0;
@@ -823,7 +823,7 @@ static void distributeFreeSpaceFirstPass(
823823
direction,
824824
mainAxis,
825825
currentLineChild->getLayout().computedFlexBasis,
826-
mainAxisownerSize)
826+
mainAxisOwnerSize)
827827
.unwrap();
828828

829829
if (flexLine.layout.remainingFreeSpace < 0) {
@@ -917,7 +917,7 @@ static void resolveFlexibleLength(
917917
const FlexDirection mainAxis,
918918
const FlexDirection crossAxis,
919919
const Direction direction,
920-
const float mainAxisownerSize,
920+
const float mainAxisOwnerSize,
921921
const float availableInnerMainDim,
922922
const float availableInnerCrossDim,
923923
const float availableInnerWidth,
@@ -934,7 +934,7 @@ static void resolveFlexibleLength(
934934
flexLine,
935935
direction,
936936
mainAxis,
937-
mainAxisownerSize,
937+
mainAxisOwnerSize,
938938
availableInnerMainDim,
939939
availableInnerWidth);
940940

@@ -945,7 +945,7 @@ static void resolveFlexibleLength(
945945
mainAxis,
946946
crossAxis,
947947
direction,
948-
mainAxisownerSize,
948+
mainAxisOwnerSize,
949949
availableInnerMainDim,
950950
availableInnerCrossDim,
951951
availableInnerWidth,
@@ -969,7 +969,7 @@ static void justifyMainAxis(
969969
const Direction direction,
970970
const SizingMode sizingModeMainDim,
971971
const SizingMode sizingModeCrossDim,
972-
const float mainAxisownerSize,
972+
const float mainAxisOwnerSize,
973973
const float ownerWidth,
974974
const float availableInnerMainDim,
975975
const float availableInnerCrossDim,
@@ -993,7 +993,7 @@ static void justifyMainAxis(
993993
if (style.minDimension(dimension(mainAxis)).isDefined() &&
994994
style
995995
.resolvedMinDimension(
996-
direction, dimension(mainAxis), mainAxisownerSize)
996+
direction, dimension(mainAxis), mainAxisOwnerSize)
997997
.isDefined()) {
998998
// This condition makes sure that if the size of main dimension(after
999999
// considering child nodes main dim, leading and trailing padding etc)
@@ -1005,7 +1005,7 @@ static void justifyMainAxis(
10051005
const float minAvailableMainDim =
10061006
style
10071007
.resolvedMinDimension(
1008-
direction, dimension(mainAxis), mainAxisownerSize)
1008+
direction, dimension(mainAxis), mainAxisOwnerSize)
10091009
.unwrap() -
10101010
leadingPaddingAndBorderMain - trailingPaddingAndBorderMain;
10111011
const float occupiedSpaceByChildNodes =
@@ -1374,8 +1374,8 @@ static void calculateLayoutImpl(
13741374
const bool isMainAxisRow = isRow(mainAxis);
13751375
const bool isNodeFlexWrap = node->style().flexWrap() != Wrap::NoWrap;
13761376

1377-
const float mainAxisownerSize = isMainAxisRow ? ownerWidth : ownerHeight;
1378-
const float crossAxisownerSize = isMainAxisRow ? ownerHeight : ownerWidth;
1377+
const float mainAxisOwnerSize = isMainAxisRow ? ownerWidth : ownerHeight;
1378+
const float crossAxisOwnerSize = isMainAxisRow ? ownerHeight : ownerWidth;
13791379

13801380
const float paddingAndBorderAxisMain =
13811381
paddingAndBorderForAxis(node, mainAxis, direction, ownerWidth);
@@ -1470,7 +1470,7 @@ static void calculateLayoutImpl(
14701470
auto flexLine = calculateFlexLine(
14711471
node,
14721472
ownerDirection,
1473-
mainAxisownerSize,
1473+
mainAxisOwnerSize,
14741474
availableInnerWidth,
14751475
availableInnerMainDim,
14761476
startOfLineIndex,
@@ -1559,7 +1559,7 @@ static void calculateLayoutImpl(
15591559
mainAxis,
15601560
crossAxis,
15611561
direction,
1562-
mainAxisownerSize,
1562+
mainAxisOwnerSize,
15631563
availableInnerMainDim,
15641564
availableInnerCrossDim,
15651565
availableInnerWidth,
@@ -1592,7 +1592,7 @@ static void calculateLayoutImpl(
15921592
direction,
15931593
sizingModeMainDim,
15941594
sizingModeCrossDim,
1595-
mainAxisownerSize,
1595+
mainAxisOwnerSize,
15961596
ownerWidth,
15971597
availableInnerMainDim,
15981598
availableInnerCrossDim,
@@ -1609,7 +1609,7 @@ static void calculateLayoutImpl(
16091609
crossAxis,
16101610
direction,
16111611
flexLine.layout.crossDim + paddingAndBorderAxisCross,
1612-
crossAxisownerSize,
1612+
crossAxisOwnerSize,
16131613
ownerWidth) -
16141614
paddingAndBorderAxisCross;
16151615
}
@@ -1630,7 +1630,7 @@ static void calculateLayoutImpl(
16301630
crossAxis,
16311631
direction,
16321632
flexLine.layout.crossDim + paddingAndBorderAxisCross,
1633-
crossAxisownerSize,
1633+
crossAxisOwnerSize,
16341634
ownerWidth) -
16351635
paddingAndBorderAxisCross;
16361636
}
@@ -1800,9 +1800,9 @@ static void calculateLayoutImpl(
18001800

18011801
const float unclampedCrossDim = sizingModeCrossDim == SizingMode::StretchFit
18021802
? availableInnerCrossDim + paddingAndBorderAxisCross
1803-
: node->hasDefiniteLength(dimension(crossAxis), crossAxisownerSize)
1803+
: node->hasDefiniteLength(dimension(crossAxis), crossAxisOwnerSize)
18041804
? node->getResolvedDimension(
1805-
direction, dimension(crossAxis), crossAxisownerSize)
1805+
direction, dimension(crossAxis), crossAxisOwnerSize)
18061806
.unwrap()
18071807
: totalLineCrossDim + paddingAndBorderAxisCross;
18081808

@@ -2042,7 +2042,7 @@ static void calculateLayoutImpl(
20422042
mainAxis,
20432043
direction,
20442044
maxLineMainDim,
2045-
mainAxisownerSize,
2045+
mainAxisOwnerSize,
20462046
ownerWidth),
20472047
dimension(mainAxis));
20482048

@@ -2058,7 +2058,7 @@ static void calculateLayoutImpl(
20582058
direction,
20592059
mainAxis,
20602060
FloatOptional{maxLineMainDim},
2061-
mainAxisownerSize)
2061+
mainAxisOwnerSize)
20622062
.unwrap()),
20632063
paddingAndBorderAxisMain),
20642064
dimension(mainAxis));
@@ -2075,7 +2075,7 @@ static void calculateLayoutImpl(
20752075
crossAxis,
20762076
direction,
20772077
totalLineCrossDim + paddingAndBorderAxisCross,
2078-
crossAxisownerSize,
2078+
crossAxisOwnerSize,
20792079
ownerWidth),
20802080
dimension(crossAxis));
20812081

@@ -2092,7 +2092,7 @@ static void calculateLayoutImpl(
20922092
crossAxis,
20932093
FloatOptional{
20942094
totalLineCrossDim + paddingAndBorderAxisCross},
2095-
crossAxisownerSize)
2095+
crossAxisOwnerSize)
20962096
.unwrap()),
20972097
paddingAndBorderAxisCross),
20982098
dimension(crossAxis));

0 commit comments

Comments
 (0)