From 3d1c8694d05d520f26a34c5785feedcaf6bbed5b Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Thu, 26 Jan 2017 13:36:39 -0800 Subject: [PATCH] Format and run codegen Reviewed By: dshahidehpour Differential Revision: D4459455 fbshipit-source-id: fc1eca58fe897c8f4a2571638b4f7035d023b479 --- .../jni/first-party/yogajni/jni/YGJNI.cpp | 10 +- ReactCommon/yoga/yoga/YGEnums.h | 111 +++++++----------- ReactCommon/yoga/yoga/YGMacros.h | 3 +- ReactCommon/yoga/yoga/Yoga.c | 73 ++++++------ ReactCommon/yoga/yoga/Yoga.h | 2 +- 5 files changed, 89 insertions(+), 110 deletions(-) diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp index 222ce3ff9..dd540bb44 100644 --- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp +++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp @@ -75,7 +75,8 @@ static void YGPrint(YGNodeRef node) { static float YGJNIBaselineFunc(YGNodeRef node, float width, float height) { if (auto obj = YGNodeJobject(node)->lockLocal()) { - static auto baselineFunc = findClassStatic("com/facebook/yoga/YogaNode")->getMethod("baseline"); + static auto baselineFunc = findClassStatic("com/facebook/yoga/YogaNode") + ->getMethod("baseline"); return baselineFunc(obj, width, height); } else { return height; @@ -222,8 +223,11 @@ void jni_YGNodeSetHasMeasureFunc(alias_ref, jlong nativePointer, jboole YGNodeSetMeasureFunc(_jlong2YGNodeRef(nativePointer), hasMeasureFunc ? YGJNIMeasureFunc : NULL); } -void jni_YGNodeSetHasBaselineFunc(alias_ref, jlong nativePointer, jboolean hasBaselineFunc) { - YGNodeSetBaselineFunc(_jlong2YGNodeRef(nativePointer), hasBaselineFunc ? YGJNIBaselineFunc : NULL); +void jni_YGNodeSetHasBaselineFunc(alias_ref, + jlong nativePointer, + jboolean hasBaselineFunc) { + YGNodeSetBaselineFunc(_jlong2YGNodeRef(nativePointer), + hasBaselineFunc ? YGJNIBaselineFunc : NULL); } jboolean jni_YGNodeHasNewLayout(alias_ref, jlong nativePointer) { diff --git a/ReactCommon/yoga/yoga/YGEnums.h b/ReactCommon/yoga/yoga/YGEnums.h index 0a10bbc2f..21eb48091 100644 --- a/ReactCommon/yoga/yoga/YGEnums.h +++ b/ReactCommon/yoga/yoga/YGEnums.h @@ -15,110 +15,89 @@ YG_EXTERN_C_BEGIN #define YGFlexDirectionCount 4 typedef YG_ENUM_BEGIN(YGFlexDirection) { - YGFlexDirectionColumn, - YGFlexDirectionColumnReverse, - YGFlexDirectionRow, - YGFlexDirectionRowReverse, -} YG_ENUM_END(YGFlexDirection); + YGFlexDirectionColumn, YGFlexDirectionColumnReverse, YGFlexDirectionRow, + YGFlexDirectionRowReverse, +} +YG_ENUM_END(YGFlexDirection); #define YGMeasureModeCount 3 typedef YG_ENUM_BEGIN(YGMeasureMode) { - YGMeasureModeUndefined, - YGMeasureModeExactly, - YGMeasureModeAtMost, -} YG_ENUM_END(YGMeasureMode); + YGMeasureModeUndefined, YGMeasureModeExactly, YGMeasureModeAtMost, +} +YG_ENUM_END(YGMeasureMode); #define YGPrintOptionsCount 3 typedef YG_ENUM_BEGIN(YGPrintOptions) { - YGPrintOptionsLayout = 1, - YGPrintOptionsStyle = 2, - YGPrintOptionsChildren = 4, -} YG_ENUM_END(YGPrintOptions); + YGPrintOptionsLayout = 1, YGPrintOptionsStyle = 2, YGPrintOptionsChildren = 4, +} +YG_ENUM_END(YGPrintOptions); #define YGEdgeCount 9 typedef YG_ENUM_BEGIN(YGEdge) { - YGEdgeLeft, - YGEdgeTop, - YGEdgeRight, - YGEdgeBottom, - YGEdgeStart, - YGEdgeEnd, - YGEdgeHorizontal, - YGEdgeVertical, - YGEdgeAll, -} YG_ENUM_END(YGEdge); + YGEdgeLeft, YGEdgeTop, YGEdgeRight, YGEdgeBottom, YGEdgeStart, YGEdgeEnd, YGEdgeHorizontal, + YGEdgeVertical, YGEdgeAll, +} +YG_ENUM_END(YGEdge); #define YGPositionTypeCount 2 typedef YG_ENUM_BEGIN(YGPositionType) { - YGPositionTypeRelative, - YGPositionTypeAbsolute, -} YG_ENUM_END(YGPositionType); + YGPositionTypeRelative, YGPositionTypeAbsolute, +} +YG_ENUM_END(YGPositionType); #define YGDimensionCount 2 typedef YG_ENUM_BEGIN(YGDimension) { - YGDimensionWidth, - YGDimensionHeight, -} YG_ENUM_END(YGDimension); + YGDimensionWidth, YGDimensionHeight, +} +YG_ENUM_END(YGDimension); #define YGJustifyCount 5 typedef YG_ENUM_BEGIN(YGJustify) { - YGJustifyFlexStart, - YGJustifyCenter, - YGJustifyFlexEnd, - YGJustifySpaceBetween, - YGJustifySpaceAround, -} YG_ENUM_END(YGJustify); + YGJustifyFlexStart, YGJustifyCenter, YGJustifyFlexEnd, YGJustifySpaceBetween, + YGJustifySpaceAround, +} +YG_ENUM_END(YGJustify); #define YGDirectionCount 3 typedef YG_ENUM_BEGIN(YGDirection) { - YGDirectionInherit, - YGDirectionLTR, - YGDirectionRTL, -} YG_ENUM_END(YGDirection); + YGDirectionInherit, YGDirectionLTR, YGDirectionRTL, +} +YG_ENUM_END(YGDirection); #define YGLogLevelCount 5 typedef YG_ENUM_BEGIN(YGLogLevel) { - YGLogLevelError, - YGLogLevelWarn, - YGLogLevelInfo, - YGLogLevelDebug, - YGLogLevelVerbose, -} YG_ENUM_END(YGLogLevel); + YGLogLevelError, YGLogLevelWarn, YGLogLevelInfo, YGLogLevelDebug, YGLogLevelVerbose, +} +YG_ENUM_END(YGLogLevel); #define YGWrapCount 2 typedef YG_ENUM_BEGIN(YGWrap) { - YGWrapNoWrap, - YGWrapWrap, -} YG_ENUM_END(YGWrap); + YGWrapNoWrap, YGWrapWrap, +} +YG_ENUM_END(YGWrap); #define YGOverflowCount 3 typedef YG_ENUM_BEGIN(YGOverflow) { - YGOverflowVisible, - YGOverflowHidden, - YGOverflowScroll, -} YG_ENUM_END(YGOverflow); + YGOverflowVisible, YGOverflowHidden, YGOverflowScroll, +} +YG_ENUM_END(YGOverflow); #define YGExperimentalFeatureCount 2 typedef YG_ENUM_BEGIN(YGExperimentalFeature) { - YGExperimentalFeatureRounding, - YGExperimentalFeatureWebFlexBasis, -} YG_ENUM_END(YGExperimentalFeature); + YGExperimentalFeatureRounding, YGExperimentalFeatureWebFlexBasis, +} +YG_ENUM_END(YGExperimentalFeature); #define YGAlignCount 6 typedef YG_ENUM_BEGIN(YGAlign) { - YGAlignAuto, - YGAlignFlexStart, - YGAlignCenter, - YGAlignFlexEnd, - YGAlignStretch, - YGAlignBaseline, -} YG_ENUM_END(YGAlign); + YGAlignAuto, YGAlignFlexStart, YGAlignCenter, YGAlignFlexEnd, YGAlignStretch, YGAlignBaseline, +} +YG_ENUM_END(YGAlign); #define YGUnitCount 3 typedef YG_ENUM_BEGIN(YGUnit) { - YGUnitUndefined, - YGUnitPixel, - YGUnitPercent, -} YG_ENUM_END(YGUnit); + YGUnitUndefined, YGUnitPixel, YGUnitPercent, +} +YG_ENUM_END(YGUnit); YG_EXTERN_C_END diff --git a/ReactCommon/yoga/yoga/YGMacros.h b/ReactCommon/yoga/yoga/YGMacros.h index 39e21b782..10580db5e 100644 --- a/ReactCommon/yoga/yoga/YGMacros.h +++ b/ReactCommon/yoga/yoga/YGMacros.h @@ -42,7 +42,8 @@ #endif #ifdef NS_ENUM -// Cannot use NSInteger as NSInteger has a different size than int (which is the default type of a enum). +// Cannot use NSInteger as NSInteger has a different size than int (which is the default type of a +// enum). // Therefor when linking the Yoga C library into obj-c the header is a missmatch for the Yoga ABI. #define YG_ENUM_BEGIN(name) NS_ENUM(int, name) #define YG_ENUM_END(name) diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c index 9ade2a6ea..424ad4926 100644 --- a/ReactCommon/yoga/yoga/Yoga.c +++ b/ReactCommon/yoga/yoga/Yoga.c @@ -532,7 +532,7 @@ void YGNodeStyleSetFlex(const YGNodeRef node, const float flex) { return node->layout.instanceName; \ } -#define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \ +#define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \ type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) { \ YG_ASSERT(edge <= YGEdgeEnd, "Cannot get layout properties of multi-edge shorthands"); \ \ @@ -1436,7 +1436,8 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node, // If the size of the parent is defined then try to constrain the absolute child to that size // as well. This allows text within the absolute child to wrap to the size of its parent. // This is the same behavior as many browsers implement. - if (!isMainAxisRow && YGFloatIsUndefined(childWidth) && widthMode != YGMeasureModeUndefined && width > 0) { + if (!isMainAxisRow && YGFloatIsUndefined(childWidth) && widthMode != YGMeasureModeUndefined && + width > 0) { childWidth = width; childWidthMeasureMode = YGMeasureModeAtMost; } @@ -1473,12 +1474,13 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node, child->layout.measuredDimensions[dim[mainAxis]] - YGNodeTrailingBorder(node, mainAxis) - YGNodeTrailingPosition(child, mainAxis, width); - } else if (!YGNodeIsLeadingPosDefined(child, mainAxis) && - node->style.justifyContent == YGJustifyCenter) { + } else if (!YGNodeIsLeadingPosDefined(child, mainAxis) && + node->style.justifyContent == YGJustifyCenter) { child->layout.position[leading[mainAxis]] = (node->layout.measuredDimensions[dim[mainAxis]] - - child->layout.measuredDimensions[dim[mainAxis]]) / 2.0f; - } else if (!YGNodeIsLeadingPosDefined(child, mainAxis) && - node->style.justifyContent == YGJustifyFlexEnd) { + child->layout.measuredDimensions[dim[mainAxis]]) / + 2.0f; + } else if (!YGNodeIsLeadingPosDefined(child, mainAxis) && + node->style.justifyContent == YGJustifyFlexEnd) { child->layout.position[leading[mainAxis]] = (node->layout.measuredDimensions[dim[mainAxis]] - child->layout.measuredDimensions[dim[mainAxis]]); } @@ -1489,12 +1491,14 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node, child->layout.measuredDimensions[dim[crossAxis]] - YGNodeTrailingBorder(node, crossAxis) - YGNodeTrailingPosition(child, crossAxis, width); - } else if (!YGNodeIsLeadingPosDefined(child, crossAxis) && - YGNodeAlignItem(node, child) == YGAlignCenter) { - child->layout.position[leading[crossAxis]] = (node->layout.measuredDimensions[dim[crossAxis]] - - child->layout.measuredDimensions[dim[crossAxis]]) / 2.0f; - } else if (!YGNodeIsLeadingPosDefined(child, crossAxis) && - YGNodeAlignItem(node, child) == YGAlignFlexEnd) { + } else if (!YGNodeIsLeadingPosDefined(child, crossAxis) && + YGNodeAlignItem(node, child) == YGAlignCenter) { + child->layout.position[leading[crossAxis]] = + (node->layout.measuredDimensions[dim[crossAxis]] - + child->layout.measuredDimensions[dim[crossAxis]]) / + 2.0f; + } else if (!YGNodeIsLeadingPosDefined(child, crossAxis) && + YGNodeAlignItem(node, child) == YGAlignFlexEnd) { child->layout.position[leading[crossAxis]] = (node->layout.measuredDimensions[dim[crossAxis]] - child->layout.measuredDimensions[dim[crossAxis]]); } @@ -1767,34 +1771,24 @@ static void YGNodelayoutImpl(const YGNodeRef node, node->layout.direction = direction; const YGFlexDirection flexRowDirection = YGFlexDirectionResolve(YGFlexDirectionRow, direction); - const YGFlexDirection flexColumnDirection = YGFlexDirectionResolve(YGFlexDirectionColumn, direction); + const YGFlexDirection flexColumnDirection = + YGFlexDirectionResolve(YGFlexDirectionColumn, direction); - node->layout.margin[YGEdgeStart] = - YGNodeLeadingMargin(node, flexRowDirection, parentWidth); - node->layout.margin[YGEdgeEnd] = - YGNodeTrailingMargin(node, flexRowDirection, parentWidth); - node->layout.margin[YGEdgeTop] = - YGNodeLeadingMargin(node, flexColumnDirection, parentWidth); - node->layout.margin[YGEdgeBottom] = - YGNodeTrailingMargin(node, flexColumnDirection, parentWidth); + node->layout.margin[YGEdgeStart] = YGNodeLeadingMargin(node, flexRowDirection, parentWidth); + node->layout.margin[YGEdgeEnd] = YGNodeTrailingMargin(node, flexRowDirection, parentWidth); + node->layout.margin[YGEdgeTop] = YGNodeLeadingMargin(node, flexColumnDirection, parentWidth); + node->layout.margin[YGEdgeBottom] = YGNodeTrailingMargin(node, flexColumnDirection, parentWidth); - node->layout.border[YGEdgeStart] = - YGNodeLeadingBorder(node, flexRowDirection); - node->layout.border[YGEdgeEnd] = - YGNodeTrailingBorder(node, flexRowDirection); - node->layout.border[YGEdgeTop] = - YGNodeLeadingBorder(node, flexColumnDirection); - node->layout.border[YGEdgeBottom] = - YGNodeTrailingBorder(node, flexColumnDirection); + node->layout.border[YGEdgeStart] = YGNodeLeadingBorder(node, flexRowDirection); + node->layout.border[YGEdgeEnd] = YGNodeTrailingBorder(node, flexRowDirection); + node->layout.border[YGEdgeTop] = YGNodeLeadingBorder(node, flexColumnDirection); + node->layout.border[YGEdgeBottom] = YGNodeTrailingBorder(node, flexColumnDirection); - node->layout.padding[YGEdgeStart] = - YGNodeLeadingPadding(node, flexRowDirection, parentWidth); - node->layout.padding[YGEdgeEnd] = - YGNodeTrailingPadding(node, flexRowDirection, parentWidth); - node->layout.padding[YGEdgeTop] = - YGNodeLeadingPadding(node, flexColumnDirection, parentWidth); + node->layout.padding[YGEdgeStart] = YGNodeLeadingPadding(node, flexRowDirection, parentWidth); + node->layout.padding[YGEdgeEnd] = YGNodeTrailingPadding(node, flexRowDirection, parentWidth); + node->layout.padding[YGEdgeTop] = YGNodeLeadingPadding(node, flexColumnDirection, parentWidth); node->layout.padding[YGEdgeBottom] = - YGNodeTrailingPadding(node, flexColumnDirection, parentWidth); + YGNodeTrailingPadding(node, flexColumnDirection, parentWidth); if (node->measure) { YGNodeWithMeasureFuncSetMeasuredDimensions( @@ -1998,8 +1992,9 @@ static void YGNodelayoutImpl(const YGNodeRef node, if (child->style.positionType != YGPositionTypeAbsolute) { const float outerFlexBasis = - fmaxf(YGValueResolve(&child->style.minDimensions[dim[mainAxis]], mainAxisParentSize), child->layout.computedFlexBasis) + - YGNodeMarginForAxis(child, mainAxis, availableInnerWidth); + fmaxf(YGValueResolve(&child->style.minDimensions[dim[mainAxis]], mainAxisParentSize), + child->layout.computedFlexBasis) + + YGNodeMarginForAxis(child, mainAxis, availableInnerWidth); // If this is a multi-line flow and this item pushes us over the // available size, we've diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h index e2210f297..ab6a2f89f 100644 --- a/ReactCommon/yoga/yoga/Yoga.h +++ b/ReactCommon/yoga/yoga/Yoga.h @@ -43,7 +43,7 @@ typedef struct YGValue { YGUnit unit; } YGValue; -static const YGValue YGValueUndefined = { YGUndefined, YGUnitUndefined }; +static const YGValue YGValueUndefined = {YGUndefined, YGUnitUndefined}; typedef struct YGNode *YGNodeRef; typedef YGSize (*YGMeasureFunc)(YGNodeRef node,