DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

using enum struct for LayoutPassReason and LayoutType

Browse Source 
Summary: Using enum struct for using enums in form ENUM_NAME::ENUM_VALUE for better code readablility

Reviewed By: davidaurelio

Differential Revision: D16356562

fbshipit-source-id: cbe7adadad78eb5d0756c44679c0e102b7d31ec6
This commit is contained in:
Sidharth Guglani
2019-07-18 07:01:26 -07:00
committed by Facebook Github Bot
parent 2fb857d73d
commit c99fc9c4da
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
yoga/Yoga.cpp
View File

@@ -1364,7 +1364,7 @@ static void YGNodeComputeFlexBasisForChild(
ownerWidth, ownerWidth,
ownerHeight, ownerHeight,
false, false,
kMeasureChild, LayoutPassReason::kMeasureChild,
config, config,
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,
@@ -1492,7 +1492,7 @@ static void YGNodeAbsoluteLayoutChild(
childWidth, childWidth,
childHeight, childHeight,
false, false,
kAbsMeasureChild, LayoutPassReason::kAbsMeasureChild,
config, config,
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,
@@ -1514,7 +1514,7 @@ static void YGNodeAbsoluteLayoutChild(
childWidth, childWidth,
childHeight, childHeight,
true, true,
kAbsLayout, LayoutPassReason::kAbsLayout,
config, config,
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,
@@ -2187,7 +2187,7 @@ static float YGDistributeFreeSpaceSecondPass(
availableInnerWidth, availableInnerWidth,
availableInnerHeight, availableInnerHeight,
performLayout && !requiresStretchLayout, performLayout && !requiresStretchLayout,
kFlex, LayoutPassReason::kFlex,
config, config,
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,
@@ -3121,7 +3121,7 @@ static void YGNodelayoutImpl(
availableInnerWidth, availableInnerWidth,
availableInnerHeight, availableInnerHeight,
true, true,
kStretch, LayoutPassReason::kStretch,
config, config,
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,
@@ -3331,7 +3331,7 @@ static void YGNodelayoutImpl(
availableInnerWidth, availableInnerWidth,
availableInnerHeight, availableInnerHeight,
true, true,
kMultilineStretch, LayoutPassReason::kMultilineStretch,
config, config,
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,
@@ -3835,7 +3835,7 @@ bool YGLayoutNodeInternal(
availableHeight, availableHeight,
cachedResults->computedWidth, cachedResults->computedWidth,
cachedResults->computedHeight, cachedResults->computedHeight,
LayoutPassReason(reason)); LayoutPassReasonToString(reason));
} }
} else { } else {
if (gPrintChanges) { if (gPrintChanges) {
@@ -3857,7 +3857,7 @@ bool YGLayoutNodeInternal(
YGMeasureModeName(heightMeasureMode, performLayout), YGMeasureModeName(heightMeasureMode, performLayout),
availableWidth, availableWidth,
availableHeight, availableHeight,
LayoutPassToString(reason)); LayoutPassReasonToString(reason));
} }
YGNodelayoutImpl( YGNodelayoutImpl(
@@ -3896,7 +3896,7 @@ bool YGLayoutNodeInternal(
YGMeasureModeName(heightMeasureMode, performLayout), YGMeasureModeName(heightMeasureMode, performLayout),
layout->measuredDimensions[YGDimensionWidth], layout->measuredDimensions[YGDimensionWidth],
layout->measuredDimensions[YGDimensionHeight], layout->measuredDimensions[YGDimensionHeight],
LayoutPassToString(reason)); LayoutPassReasonToString(reason));
} }
layout->lastOwnerDirection = ownerDirection; layout->lastOwnerDirection = ownerDirection;
@@ -4126,7 +4126,7 @@ void YGNodeCalculateLayoutWithContext(
ownerWidth, ownerWidth,
ownerHeight, ownerHeight,
true, true,
kInitial, LayoutPassReason::kInitial,
node->getConfig(), node->getConfig(),
markerData, markerData,
layoutContext, layoutContext,
@@ -4176,7 +4176,7 @@ void YGNodeCalculateLayoutWithContext(
ownerWidth, ownerWidth,
ownerHeight, ownerHeight,
true, true,
kInitial, LayoutPassReason::kInitial,
nodeWithoutLegacyFlag->getConfig(), nodeWithoutLegacyFlag->getConfig(),
layoutMarkerData, layoutMarkerData,
layoutContext, layoutContext,

16
yoga/event/event.cpp
View File

@@ -12,21 +12,21 @@
namespace facebook { namespace facebook {
namespace yoga { namespace yoga {
const char* LayoutPassToString(const LayoutPassReason value) { const char* LayoutPassReasonToString(const LayoutPassReason value) {
switch (value) { switch (value) {
case kInitial: case LayoutPassReason::kInitial:
return "initial"; return "initial";
case kMeasureChild: case LayoutPassReason::kMeasureChild:
return "measure"; return "measure";
case kAbsMeasureChild: case LayoutPassReason::kAbsMeasureChild:
return "abs_measure"; return "abs_measure";
case kFlex: case LayoutPassReason::kFlex:
return "flex"; return "flex";
case kAbsLayout: case LayoutPassReason::kAbsLayout:
return "abs_layout"; return "abs_layout";
case kStretch: case LayoutPassReason::kStretch:
return "stretch"; return "stretch";
case kMultilineStretch: case LayoutPassReason::kMultilineStretch:
return "multiline_stretch"; return "multiline_stretch";
default: default:
return "unknown"; return "unknown";

6
yoga/event/event.h
View File

@@ -16,7 +16,7 @@ struct YGNode;
namespace facebook { namespace facebook {
namespace yoga { namespace yoga {
enum LayoutType : int { enum struct LayoutType : int {
kLayout = 0, kLayout = 0,
kMeasure = 1, kMeasure = 1,
kCachedLayout = 2, kCachedLayout = 2,
@@ -32,7 +32,7 @@ struct LayoutData {
int measureCallbacks; int measureCallbacks;
}; };
enum LayoutPassReason : int { enum struct LayoutPassReason : int {
kInitial = 0, kInitial = 0,
kMeasureChild = 1, kMeasureChild = 1,
kAbsMeasureChild = 2, kAbsMeasureChild = 2,
@@ -42,7 +42,7 @@ enum LayoutPassReason : int {
kMultilineStretch = 6 kMultilineStretch = 6
}; };
const char* LayoutPassToString(const LayoutPassReason value); const char* LayoutPassReasonToString(const LayoutPassReason value);
struct Event { struct Event {
enum Type { enum Type {