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

Revert D45722118: remove extra semis from arfx/atlas/modules and deps

Browse Source 
Differential Revision:
D45722118

Original commit changeset: a749ca9e979d

Original Phabricator Diff: D45722118

fbshipit-source-id: 9316f2946966e001f0884af17bf733a1a48e75cc
This commit is contained in:
Junfeng Li
2023-05-12 15:57:47 -07:00
committed by Facebook GitHub Bot
parent 13e2b5ee73
commit 974473aa99
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yoga/YGNode.cpp
View File

@@ -21,7 +21,7 @@ YGNode::YGNode(const YGConfigRef config) : config_{config} {
if (config->useWebDefaults()) { if (config->useWebDefaults()) {
useWebDefaults(); useWebDefaults();
} }
} };
YGNode::YGNode(YGNode&& node) { YGNode::YGNode(YGNode&& node) {
context_ = node.context_; context_ = node.context_;

30
yoga/Yoga.cpp
View File

@@ -845,7 +845,7 @@ YOGA_EXPORT void YGNodeStyleSetMinWidthPercent(
} }
YOGA_EXPORT YGValue YGNodeStyleGetMinWidth(const YGNodeConstRef node) { YOGA_EXPORT YGValue YGNodeStyleGetMinWidth(const YGNodeConstRef node) {
return node->getStyle().minDimensions()[YGDimensionWidth]; return node->getStyle().minDimensions()[YGDimensionWidth];
} };
YOGA_EXPORT void YGNodeStyleSetMinHeight( YOGA_EXPORT void YGNodeStyleSetMinHeight(
const YGNodeRef node, const YGNodeRef node,
@@ -863,7 +863,7 @@ YOGA_EXPORT void YGNodeStyleSetMinHeightPercent(
} }
YOGA_EXPORT YGValue YGNodeStyleGetMinHeight(const YGNodeConstRef node) { YOGA_EXPORT YGValue YGNodeStyleGetMinHeight(const YGNodeConstRef node) {
return node->getStyle().minDimensions()[YGDimensionHeight]; return node->getStyle().minDimensions()[YGDimensionHeight];
} };
YOGA_EXPORT void YGNodeStyleSetMaxWidth( YOGA_EXPORT void YGNodeStyleSetMaxWidth(
const YGNodeRef node, const YGNodeRef node,
@@ -881,7 +881,7 @@ YOGA_EXPORT void YGNodeStyleSetMaxWidthPercent(
} }
YOGA_EXPORT YGValue YGNodeStyleGetMaxWidth(const YGNodeConstRef node) { YOGA_EXPORT YGValue YGNodeStyleGetMaxWidth(const YGNodeConstRef node) {
return node->getStyle().maxDimensions()[YGDimensionWidth]; return node->getStyle().maxDimensions()[YGDimensionWidth];
} };
YOGA_EXPORT void YGNodeStyleSetMaxHeight( YOGA_EXPORT void YGNodeStyleSetMaxHeight(
const YGNodeRef node, const YGNodeRef node,
@@ -899,7 +899,7 @@ YOGA_EXPORT void YGNodeStyleSetMaxHeightPercent(
} }
YOGA_EXPORT YGValue YGNodeStyleGetMaxHeight(const YGNodeConstRef node) { YOGA_EXPORT YGValue YGNodeStyleGetMaxHeight(const YGNodeConstRef node) {
return node->getStyle().maxDimensions()[YGDimensionHeight]; return node->getStyle().maxDimensions()[YGDimensionHeight];
} };
#define YG_NODE_LAYOUT_PROPERTY_IMPL(type, name, instanceName) \ #define YG_NODE_LAYOUT_PROPERTY_IMPL(type, name, instanceName) \
YOGA_EXPORT type YGNodeLayoutGet##name(const YGNodeRef node) { \ YOGA_EXPORT type YGNodeLayoutGet##name(const YGNodeRef node) { \
@@ -933,18 +933,18 @@ YOGA_EXPORT YGValue YGNodeStyleGetMaxHeight(const YGNodeConstRef node) {
return node->getLayout().instanceName[edge]; \ return node->getLayout().instanceName[edge]; \
} }
YG_NODE_LAYOUT_PROPERTY_IMPL(float, Left, position[YGEdgeLeft]) YG_NODE_LAYOUT_PROPERTY_IMPL(float, Left, position[YGEdgeLeft]);
YG_NODE_LAYOUT_PROPERTY_IMPL(float, Top, position[YGEdgeTop]) YG_NODE_LAYOUT_PROPERTY_IMPL(float, Top, position[YGEdgeTop]);
YG_NODE_LAYOUT_PROPERTY_IMPL(float, Right, position[YGEdgeRight]) YG_NODE_LAYOUT_PROPERTY_IMPL(float, Right, position[YGEdgeRight]);
YG_NODE_LAYOUT_PROPERTY_IMPL(float, Bottom, position[YGEdgeBottom]) YG_NODE_LAYOUT_PROPERTY_IMPL(float, Bottom, position[YGEdgeBottom]);
YG_NODE_LAYOUT_PROPERTY_IMPL(float, Width, dimensions[YGDimensionWidth]) YG_NODE_LAYOUT_PROPERTY_IMPL(float, Width, dimensions[YGDimensionWidth]);
YG_NODE_LAYOUT_PROPERTY_IMPL(float, Height, dimensions[YGDimensionHeight]) YG_NODE_LAYOUT_PROPERTY_IMPL(float, Height, dimensions[YGDimensionHeight]);
YG_NODE_LAYOUT_PROPERTY_IMPL(YGDirection, Direction, direction()) YG_NODE_LAYOUT_PROPERTY_IMPL(YGDirection, Direction, direction());
YG_NODE_LAYOUT_PROPERTY_IMPL(bool, HadOverflow, hadOverflow()) YG_NODE_LAYOUT_PROPERTY_IMPL(bool, HadOverflow, hadOverflow());
YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Margin, margin) YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Margin, margin);
YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Border, border) YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Border, border);
YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Padding, padding) YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Padding, padding);
std::atomic<uint32_t> gCurrentGenerationCount(0); std::atomic<uint32_t> gCurrentGenerationCount(0);