Skip to content

Commit 4475374

Browse files
NickGerlemanpull[bot]
authored andcommitted
C++ style enums 7/N: MeasureMode (#39452)
Summary: Pull Request resolved: #39452 X-link: facebook/yoga#1389 This converts usages of YGMeasureMode to MeasureMode Reviewed By: rozele Differential Revision: D49271165 fbshipit-source-id: 273c9ed0a61c3965e469548d29d37e4566c974dc
1 parent e5a7551 commit 4475374

File tree

7 files changed

+180
-179
lines changed

7 files changed

+180
-179
lines changed

packages/react-native/ReactCommon/yoga/yoga/Yoga.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -905,13 +905,13 @@ bool YGNodeCanUseCachedMeasurement(
905905
float marginColumn,
906906
YGConfigRef config) {
907907
return yoga::canUseCachedMeasurement(
908-
widthMode,
908+
scopedEnum(widthMode),
909909
availableWidth,
910-
heightMode,
910+
scopedEnum(heightMode),
911911
availableHeight,
912-
lastWidthMode,
912+
scopedEnum(lastWidthMode),
913913
lastAvailableWidth,
914-
lastHeightMode,
914+
scopedEnum(lastHeightMode),
915915
lastAvailableHeight,
916916
lastComputedWidth,
917917
lastComputedHeight,

packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.cpp

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,50 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
#include <yoga/Yoga.h>
9-
108
#include <yoga/algorithm/Cache.h>
119
#include <yoga/algorithm/PixelGrid.h>
1210
#include <yoga/numeric/Comparison.h>
1311

1412
namespace facebook::yoga {
1513

1614
static inline bool sizeIsExactAndMatchesOldMeasuredSize(
17-
YGMeasureMode sizeMode,
15+
MeasureMode sizeMode,
1816
float size,
1917
float lastComputedSize) {
20-
return sizeMode == YGMeasureModeExactly &&
18+
return sizeMode == MeasureMode::Exactly &&
2119
yoga::inexactEquals(size, lastComputedSize);
2220
}
2321

2422
static inline bool oldSizeIsUnspecifiedAndStillFits(
25-
YGMeasureMode sizeMode,
23+
MeasureMode sizeMode,
2624
float size,
27-
YGMeasureMode lastSizeMode,
25+
MeasureMode lastSizeMode,
2826
float lastComputedSize) {
29-
return sizeMode == YGMeasureModeAtMost &&
30-
lastSizeMode == YGMeasureModeUndefined &&
27+
return sizeMode == MeasureMode::AtMost &&
28+
lastSizeMode == MeasureMode::Undefined &&
3129
(size >= lastComputedSize || yoga::inexactEquals(size, lastComputedSize));
3230
}
3331

3432
static inline bool newMeasureSizeIsStricterAndStillValid(
35-
YGMeasureMode sizeMode,
33+
MeasureMode sizeMode,
3634
float size,
37-
YGMeasureMode lastSizeMode,
35+
MeasureMode lastSizeMode,
3836
float lastSize,
3937
float lastComputedSize) {
40-
return lastSizeMode == YGMeasureModeAtMost &&
41-
sizeMode == YGMeasureModeAtMost && !std::isnan(lastSize) &&
38+
return lastSizeMode == MeasureMode::AtMost &&
39+
sizeMode == MeasureMode::AtMost && !std::isnan(lastSize) &&
4240
!std::isnan(size) && !std::isnan(lastComputedSize) && lastSize > size &&
4341
(lastComputedSize <= size || yoga::inexactEquals(size, lastComputedSize));
4442
}
4543

4644
bool canUseCachedMeasurement(
47-
const YGMeasureMode widthMode,
45+
const MeasureMode widthMode,
4846
const float availableWidth,
49-
const YGMeasureMode heightMode,
47+
const MeasureMode heightMode,
5048
const float availableHeight,
51-
const YGMeasureMode lastWidthMode,
49+
const MeasureMode lastWidthMode,
5250
const float lastAvailableWidth,
53-
const YGMeasureMode lastHeightMode,
51+
const MeasureMode lastHeightMode,
5452
const float lastAvailableHeight,
5553
const float lastComputedWidth,
5654
const float lastComputedHeight,

packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77

88
#pragma once
99

10-
#include <yoga/Yoga.h>
1110
#include <yoga/config/Config.h>
11+
#include <yoga/enums/MeasureMode.h>
1212

1313
namespace facebook::yoga {
1414

1515
bool canUseCachedMeasurement(
16-
YGMeasureMode widthMode,
16+
MeasureMode widthMode,
1717
float availableWidth,
18-
YGMeasureMode heightMode,
18+
MeasureMode heightMode,
1919
float availableHeight,
20-
YGMeasureMode lastWidthMode,
20+
MeasureMode lastWidthMode,
2121
float lastAvailableWidth,
22-
YGMeasureMode lastHeightMode,
22+
MeasureMode lastHeightMode,
2323
float lastAvailableHeight,
2424
float lastComputedWidth,
2525
float lastComputedHeight,

0 commit comments

Comments
 (0)