From c34ad17c940f9d2b8a39faae083c101ce5e51918 Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Thu, 22 Nov 2018 08:06:25 -0800 Subject: [PATCH] Pass enums by value Summary: @public passes all enum values by value, not by reference. Reviewed By: astreet Differential Revision: D13156390 fbshipit-source-id: 56aea66c16ab3325594f67b9017afa18a678d281 --- ReactCommon/yoga/yoga/YGNode.cpp | 28 ++++++++++++++-------------- ReactCommon/yoga/yoga/YGNode.h | 28 ++++++++++++++-------------- ReactCommon/yoga/yoga/Yoga.cpp | 10 +++++----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp index 7d3f37c2b..189a3df1c 100644 --- a/ReactCommon/yoga/yoga/YGNode.cpp +++ b/ReactCommon/yoga/yoga/YGNode.cpp @@ -12,7 +12,7 @@ using namespace facebook; YGFloatOptional YGNode::getLeadingPosition( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float axisSize) const { if (YGFlexDirectionIsRow(axis)) { const YGValue* leadingPosition = @@ -31,7 +31,7 @@ YGFloatOptional YGNode::getLeadingPosition( } YGFloatOptional YGNode::getTrailingPosition( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float axisSize) const { if (YGFlexDirectionIsRow(axis)) { const YGValue* trailingPosition = @@ -49,7 +49,7 @@ YGFloatOptional YGNode::getTrailingPosition( : YGResolveValue(*trailingPosition, axisSize); } -bool YGNode::isLeadingPositionDefined(const YGFlexDirection& axis) const { +bool YGNode::isLeadingPositionDefined(const YGFlexDirection axis) const { return (YGFlexDirectionIsRow(axis) && YGComputedEdgeValue(style_.position, YGEdgeStart, &YGValueUndefined) ->unit != YGUnitUndefined) || @@ -57,7 +57,7 @@ bool YGNode::isLeadingPositionDefined(const YGFlexDirection& axis) const { ->unit != YGUnitUndefined; } -bool YGNode::isTrailingPosDefined(const YGFlexDirection& axis) const { +bool YGNode::isTrailingPosDefined(const YGFlexDirection axis) const { return (YGFlexDirectionIsRow(axis) && YGComputedEdgeValue(style_.position, YGEdgeEnd, &YGValueUndefined) ->unit != YGUnitUndefined) || @@ -66,7 +66,7 @@ bool YGNode::isTrailingPosDefined(const YGFlexDirection& axis) const { } YGFloatOptional YGNode::getLeadingMargin( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { if (YGFlexDirectionIsRow(axis) && style_.margin[YGEdgeStart].unit != YGUnitUndefined) { @@ -79,7 +79,7 @@ YGFloatOptional YGNode::getLeadingMargin( } YGFloatOptional YGNode::getTrailingMargin( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { if (YGFlexDirectionIsRow(axis) && style_.margin[YGEdgeEnd].unit != YGUnitUndefined) { @@ -92,7 +92,7 @@ YGFloatOptional YGNode::getTrailingMargin( } YGFloatOptional YGNode::getMarginForAxis( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { return getLeadingMargin(axis, widthSize) + getTrailingMargin(axis, widthSize); } @@ -204,7 +204,7 @@ void YGNode::setLayoutDimension(float dimension, int index) { // If both left and right are defined, then use left. Otherwise return // +left or -right depending on which is defined. YGFloatOptional YGNode::relativePosition( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float axisSize) const { if (isLeadingPositionDefined(axis)) { return getLeadingPosition(axis, axisSize); @@ -424,7 +424,7 @@ bool YGNode::isNodeFlexible() { (resolveFlexGrow() != 0 || resolveFlexShrink() != 0)); } -float YGNode::getLeadingBorder(const YGFlexDirection& axis) const { +float YGNode::getLeadingBorder(const YGFlexDirection axis) const { if (YGFlexDirectionIsRow(axis) && style_.border[YGEdgeStart].unit != YGUnitUndefined && !yoga::isUndefined(style_.border[YGEdgeStart].value) && @@ -437,7 +437,7 @@ float YGNode::getLeadingBorder(const YGFlexDirection& axis) const { return YGFloatMax(computedEdgeValue, 0.0f); } -float YGNode::getTrailingBorder(const YGFlexDirection& flexDirection) const { +float YGNode::getTrailingBorder(const YGFlexDirection flexDirection) const { if (YGFlexDirectionIsRow(flexDirection) && style_.border[YGEdgeEnd].unit != YGUnitUndefined && !yoga::isUndefined(style_.border[YGEdgeEnd].value) && @@ -452,7 +452,7 @@ float YGNode::getTrailingBorder(const YGFlexDirection& flexDirection) const { } YGFloatOptional YGNode::getLeadingPadding( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { const YGFloatOptional& paddingEdgeStart = YGResolveValue(style_.padding[YGEdgeStart], widthSize); @@ -469,7 +469,7 @@ YGFloatOptional YGNode::getLeadingPadding( } YGFloatOptional YGNode::getTrailingPadding( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { if (YGFlexDirectionIsRow(axis) && style_.padding[YGEdgeEnd].unit != YGUnitUndefined && @@ -486,14 +486,14 @@ YGFloatOptional YGNode::getTrailingPadding( } YGFloatOptional YGNode::getLeadingPaddingAndBorder( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { return getLeadingPadding(axis, widthSize) + YGFloatOptional(getLeadingBorder(axis)); } YGFloatOptional YGNode::getTrailingPaddingAndBorder( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const { return getTrailingPadding(axis, widthSize) + YGFloatOptional(getTrailingBorder(axis)); diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h index 698c07e42..678926d3a 100644 --- a/ReactCommon/yoga/yoga/YGNode.h +++ b/ReactCommon/yoga/yoga/YGNode.h @@ -33,7 +33,7 @@ struct YGNode { {YGValueUndefined, YGValueUndefined}}; YGFloatOptional relativePosition( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float axisSize) const; public: @@ -138,35 +138,35 @@ struct YGNode { // Methods related to positions, margin, padding and border YGFloatOptional getLeadingPosition( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float axisSize) const; - bool isLeadingPositionDefined(const YGFlexDirection& axis) const; - bool isTrailingPosDefined(const YGFlexDirection& axis) const; + bool isLeadingPositionDefined(const YGFlexDirection axis) const; + bool isTrailingPosDefined(const YGFlexDirection axis) const; YGFloatOptional getTrailingPosition( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float axisSize) const; YGFloatOptional getLeadingMargin( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; YGFloatOptional getTrailingMargin( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; - float getLeadingBorder(const YGFlexDirection& flexDirection) const; - float getTrailingBorder(const YGFlexDirection& flexDirection) const; + float getLeadingBorder(const YGFlexDirection flexDirection) const; + float getTrailingBorder(const YGFlexDirection flexDirection) const; YGFloatOptional getLeadingPadding( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; YGFloatOptional getTrailingPadding( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; YGFloatOptional getLeadingPaddingAndBorder( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; YGFloatOptional getTrailingPaddingAndBorder( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; YGFloatOptional getMarginForAxis( - const YGFlexDirection& axis, + const YGFlexDirection axis, const float widthSize) const; // Setters diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index e0b84d7c1..d05e0da91 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -1220,7 +1220,7 @@ static inline bool YGNodeIsLayoutDimDefined( static YGFloatOptional YGNodeBoundAxisWithinMinAndMax( const YGNodeRef node, - const YGFlexDirection& axis, + const YGFlexDirection axis, const float value, const float axisSize) { YGFloatOptional min; @@ -2423,10 +2423,10 @@ static void YGJustifyMainAxis( const YGNodeRef node, YGCollectFlexItemsRowValues& collectedFlexItemsValues, const uint32_t startOfLineIndex, - const YGFlexDirection& mainAxis, - const YGFlexDirection& crossAxis, - const YGMeasureMode& measureModeMainDim, - const YGMeasureMode& measureModeCrossDim, + const YGFlexDirection mainAxis, + const YGFlexDirection crossAxis, + const YGMeasureMode measureModeMainDim, + const YGMeasureMode measureModeCrossDim, const float mainAxisownerSize, const float ownerWidth, const float availableInnerMainDim,