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

Add YGErrata integration within C ABI (#37075)

Browse Source 
Summary:
X-link: https://github.com/facebook/react-native/pull/37075

Pull Request resolved: https://github.com/facebook/yoga/pull/1255

This diff wires up YGErrata to a public API, along with existing functions to set UseLegacyStretchBehaviour.

The `UseLegacyStretchBehaviour` functions will be removed after the world internally is transitioned to `YGConfigSetErrata`. This is intentionally breaking, since most users previously enabling `UseLegacyStretchBehaviour` will want to pick a new appropriate errata setting. Internally, users of the API will be moved to`YGErrataAll`.

The overall change looks like:
1. Clean up YGConfig to use accessors/setters
2. Change up YGconfig internal storage
    1. Fabric has a config per ShadowNode, so it makes sense to do some size optimization before adding more (free-form bools to bitfield, `std::array<bool,>` to `std::bitset` since not specialized)
3. Wire accessor/setter of UseLegacyStretchBehaviour to errata while both APIs exist
4. Add errata APIs to C ABI

After this we will need to expose the ABI to more language projections, and (more involved), add usages of the API to internal consumption of Yoga before adding more errata and removing `UseLegacyStretchBehaviour`.

Note that this API representation is similar, but distinct to `YGExperimentalFeature`. I think that API may also have made sense as an enum bitset, like we explicitly want for the new API, but it's not really worth changing the existing API to make that happen.

Reviewed By: rshest

Differential Revision: D45254097

fbshipit-source-id: 5c725ce5a77b25c1356f753d11c468587dbd8ded
This commit is contained in:
Nick Gerleman
2023-04-27 06:48:04 -07:00
committed by Facebook GitHub Bot
parent 36406ce17c
commit fc6485b8cd
6 changed files with 228 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
yoga/Yoga.cpp
View File

@@ -169,7 +169,7 @@ YOGA_EXPORT bool YGNodeGetHasNewLayout(YGNodeRef node) {
}
YOGA_EXPORT void YGConfigSetPrintTreeFlag(YGConfigRef config, bool enabled) {
config->printTree = enabled;
config->setShouldPrintTree(enabled);
}
YOGA_EXPORT void YGNodeSetHasNewLayout(YGNodeRef node, bool hasNewLayout) {
@@ -464,8 +464,8 @@ YOGA_EXPORT float YGNodeStyleGetFlexGrow(const YGNodeConstRef node) {
YOGA_EXPORT float YGNodeStyleGetFlexShrink(const YGNodeConstRef node) {
return node->getStyle().flexShrink().isUndefined()
? (node->getConfig()->useWebDefaults ? kWebDefaultFlexShrink
: kDefaultFlexShrink)
? (node->getConfig()->useWebDefaults() ? kWebDefaultFlexShrink
: kDefaultFlexShrink)
: node->getStyle().flexShrink().unwrap();
}
@@ -1240,8 +1240,8 @@ static void YGNodeComputeFlexBasisForChild(
if (!resolvedFlexBasis.isUndefined() && !YGFloatIsUndefined(mainAxisSize)) {
if (child->getLayout().computedFlexBasis.isUndefined() ||
(YGConfigIsExperimentalFeatureEnabled(
child->getConfig(), YGExperimentalFeatureWebFlexBasis) &&
(child->getConfig()->isExperimentalFeatureEnabled(
YGExperimentalFeatureWebFlexBasis) &&
child->getLayout().computedFlexBasisGeneration != generationCount)) {
const YGFloatOptional paddingAndBorder = YGFloatOptional(
YGNodePaddingAndBorderForAxis(child, mainAxis, ownerWidth));
@@ -1548,8 +1548,7 @@ static void YGNodeAbsoluteLayoutChild(
generationCount);
auto trailingMarginOuterSize =
YGConfigIsExperimentalFeatureEnabled(
node->getConfig(),
node->getConfig()->isExperimentalFeatureEnabled(
YGExperimentalFeatureFixAbsoluteTrailingColumnMargin)
? isMainAxisRow ? height : width
: width;
@@ -1581,8 +1580,7 @@ static void YGNodeAbsoluteLayoutChild(
child->getLayout().measuredDimensions[dim[mainAxis]]),
leading[mainAxis]);
} else if (
YGConfigIsExperimentalFeatureEnabled(
node->getConfig(),
node->getConfig()->isExperimentalFeatureEnabled(
YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge) &&
child->isLeadingPositionDefined(mainAxis)) {
child->setLayoutPosition(
@@ -1628,8 +1626,7 @@ static void YGNodeAbsoluteLayoutChild(
child->getLayout().measuredDimensions[dim[crossAxis]]),
leading[crossAxis]);
} else if (
YGConfigIsExperimentalFeatureEnabled(
node->getConfig(),
node->getConfig()->isExperimentalFeatureEnabled(
YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge) &&
child->isLeadingPositionDefined(crossAxis)) {
child->setLayoutPosition(
@@ -2990,7 +2987,10 @@ static void YGNodelayoutImpl(
maxInnerMainDim) {
availableInnerMainDim = maxInnerMainDim;
} else {
if (!node->getConfig()->useLegacyStretchBehaviour &&
bool useLegacyStretchBehaviour =
node->getConfig()->getErrata() & YGErrataStretchFlexBasis;
if (!useLegacyStretchBehaviour &&
((!YGFloatIsUndefined(
collectedFlexItemsValues.totalFlexGrowFactors) &&
collectedFlexItemsValues.totalFlexGrowFactors == 0) ||
@@ -3003,7 +3003,7 @@ static void YGNodelayoutImpl(
collectedFlexItemsValues.sizeConsumedOnCurrentLine;
}
sizeBasedOnContent = !node->getConfig()->useLegacyStretchBehaviour;
sizeBasedOnContent = !useLegacyStretchBehaviour;
}
}
@@ -3557,18 +3557,18 @@ static void YGNodelayoutImpl(
child->getStyle().positionType() != YGPositionTypeAbsolute) {
continue;
}
const bool absolutePercentageAgainstPaddingEdge =
node->getConfig()->isExperimentalFeatureEnabled(
YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge);
YGNodeAbsoluteLayoutChild(
node,
child,
YGConfigIsExperimentalFeatureEnabled(
node->getConfig(),
YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge)
absolutePercentageAgainstPaddingEdge
? node->getLayout().measuredDimensions[YGDimensionWidth]
: availableInnerWidth,
isMainAxisRow ? measureModeMainDim : measureModeCrossDim,
YGConfigIsExperimentalFeatureEnabled(
node->getConfig(),
YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge)
absolutePercentageAgainstPaddingEdge
? node->getLayout().measuredDimensions[YGDimensionHeight]
: availableInnerHeight,
direction,
@@ -3735,20 +3735,22 @@ YOGA_EXPORT bool YGNodeCanUseCachedMeasurement(
return false;
}
bool useRoundedComparison =
config != nullptr && config->pointScaleFactor != 0;
config != nullptr && config->getPointScaleFactor() != 0;
const float effectiveWidth = useRoundedComparison
? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false)
? YGRoundValueToPixelGrid(
width, config->getPointScaleFactor(), false, false)
: width;
const float effectiveHeight = useRoundedComparison
? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false)
? YGRoundValueToPixelGrid(
height, config->getPointScaleFactor(), false, false)
: height;
const float effectiveLastWidth = useRoundedComparison
? YGRoundValueToPixelGrid(
lastWidth, config->pointScaleFactor, false, false)
lastWidth, config->getPointScaleFactor(), false, false)
: lastWidth;
const float effectiveLastHeight = useRoundedComparison
? YGRoundValueToPixelGrid(
lastHeight, config->pointScaleFactor, false, false)
lastHeight, config->getPointScaleFactor(), false, false)
: lastHeight;
const bool hasSameWidthSpec = lastWidthMode == widthMode &&
@@ -4075,9 +4077,9 @@ YOGA_EXPORT void YGConfigSetPointScaleFactor(
// We store points for Pixel as we will use it for rounding
if (pixelsInPoint == 0.0f) {
// Zero is used to skip rounding
config->pointScaleFactor = 0.0f;
config->setPointScaleFactor(0.0f);
} else {
config->pointScaleFactor = pixelsInPoint;
config->setPointScaleFactor(pixelsInPoint);
}
}
@@ -4227,10 +4229,11 @@ YOGA_EXPORT void YGNodeCalculateLayoutWithContext(
gCurrentGenerationCount.load(std::memory_order_relaxed))) {
node->setPosition(
node->getLayout().direction(), ownerWidth, ownerHeight, ownerWidth);
YGRoundToPixelGrid(node, node->getConfig()->pointScaleFactor, 0.0f, 0.0f);
YGRoundToPixelGrid(
node, node->getConfig()->getPointScaleFactor(), 0.0f, 0.0f);
#ifdef DEBUG
if (node->getConfig()->printTree) {
if (node->getConfig()->shouldPrintTree()) {
YGNodePrint(
node,
(YGPrintOptions) (YGPrintOptionsLayout | YGPrintOptionsChildren | YGPrintOptionsStyle));
@@ -4293,42 +4296,54 @@ YOGA_EXPORT void YGConfigSetExperimentalFeatureEnabled(
const YGConfigRef config,
const YGExperimentalFeature feature,
const bool enabled) {
config->experimentalFeatures[feature] = enabled;
config->setExperimentalFeatureEnabled(feature, enabled);
}
YOGA_EXPORT bool YGConfigIsExperimentalFeatureEnabled(
const YGConfigRef config,
const YGExperimentalFeature feature) {
return config->experimentalFeatures[feature];
return config->isExperimentalFeatureEnabled(feature);
}
YOGA_EXPORT void YGConfigSetUseWebDefaults(
const YGConfigRef config,
const bool enabled) {
config->useWebDefaults = enabled;
config->setUseWebDefaults(enabled);
}
YOGA_EXPORT bool YGConfigGetUseLegacyStretchBehaviour(
const YGConfigRef config) {
return config->useLegacyStretchBehaviour;
return config->getErrata() & YGErrataStretchFlexBasis;
}
YOGA_EXPORT void YGConfigSetUseLegacyStretchBehaviour(
const YGConfigRef config,
const bool useLegacyStretchBehaviour) {
config->useLegacyStretchBehaviour = useLegacyStretchBehaviour;
if (useLegacyStretchBehaviour) {
config->setErrata(config->getErrata() | YGErrataStretchFlexBasis);
} else {
config->setErrata(config->getErrata() & ~YGErrataStretchFlexBasis);
}
}
bool YGConfigGetUseWebDefaults(const YGConfigRef config) {
return config->useWebDefaults;
return config->useWebDefaults();
}
YOGA_EXPORT void YGConfigSetContext(const YGConfigRef config, void* context) {
config->context = context;
config->setContext(context);
}
YOGA_EXPORT void* YGConfigGetContext(const YGConfigRef config) {
return config->context;
return config->getContext();
}
YOGA_EXPORT void YGConfigSetErrata(YGConfigRef config, YGErrata errata) {
config->setErrata(errata);
}
YOGA_EXPORT YGErrata YGConfigGetErrata(YGConfigRef config) {
return config->getErrata();
}
YOGA_EXPORT void YGConfigSetCloneNodeFunc(