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

Remove unnecessary indirection

Browse Source 
Summary: Remove unnecessary function calls which just caused indirection and thus confusion. These were an artifact of the regex transpilation.

Reviewed By: IanChilds

Differential Revision: D3741988

fbshipit-source-id: fdb31dc45a478508b41c522f0e1b3ef842971b50
This commit is contained in:
Emil Sjolander
2016-08-22 06:58:11 -07:00
committed by Facebook Github Bot 6
parent 0672f5572f
commit 4bcefd8845
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CSSLayout/CSSLayout.c
View File

@@ -582,10 +582,6 @@ static CSSDirection resolveDirection(CSSNode *node, CSSDirection parentDirection
return direction; return direction;
} }
static CSSFlexDirection getFlexDirection(CSSNode *node) {
return node->style.flexDirection;
}
static CSSFlexDirection resolveAxis(CSSFlexDirection flexDirection, CSSDirection direction) { static CSSFlexDirection resolveAxis(CSSFlexDirection flexDirection, CSSDirection direction) {
if (direction == CSSDirectionRTL) { if (direction == CSSDirectionRTL) {
if (flexDirection == CSSFlexDirectionRow) { if (flexDirection == CSSFlexDirectionRow) {
@@ -612,10 +608,6 @@ static bool isFlex(CSSNode *node) {
(node->style.flexGrow != 0 || node->style.flexShrink != 0)); (node->style.flexGrow != 0 || node->style.flexShrink != 0));
} }
static bool isFlexWrap(CSSNode *node) {
return node->style.flexWrap == CSSWrapTypeWrap;
}
static float getDimWithMargin(CSSNode *node, CSSFlexDirection axis) { static float getDimWithMargin(CSSNode *node, CSSFlexDirection axis) {
return node->layout.measuredDimensions[dim[axis]] + getLeadingMargin(node, axis) + return node->layout.measuredDimensions[dim[axis]] + getLeadingMargin(node, axis) +
getTrailingMargin(node, axis); getTrailingMargin(node, axis);
@@ -646,10 +638,6 @@ static bool isTrailingPosDefined(CSSNode *node, CSSFlexDirection axis) {
computedEdgeValue(node->style.position, trailing[axis], CSSUndefined)); computedEdgeValue(node->style.position, trailing[axis], CSSUndefined));
} }
static bool isMeasureDefined(CSSNode *node) {
return node->measure;
}
static float getLeadingPosition(CSSNode *node, CSSFlexDirection axis) { static float getLeadingPosition(CSSNode *node, CSSFlexDirection axis) {
if (isRowDirection(axis) && if (isRowDirection(axis) &&
!CSSValueIsUndefined(computedEdgeValue(node->style.position, CSSEdgeStart, CSSUndefined))) { !CSSValueIsUndefined(computedEdgeValue(node->style.position, CSSEdgeStart, CSSUndefined))) {
@@ -719,7 +707,7 @@ static float getRelativePosition(CSSNode *node, CSSFlexDirection axis) {
} }
static void setPosition(CSSNode *node, CSSDirection direction) { static void setPosition(CSSNode *node, CSSDirection direction) {
CSSFlexDirection mainAxis = resolveAxis(getFlexDirection(node), direction); CSSFlexDirection mainAxis = resolveAxis(node->style.flexDirection, direction);
CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction); CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction);
node->layout.position[leading[mainAxis]] = node->layout.position[leading[mainAxis]] =
@@ -871,7 +859,7 @@ static void layoutNodeImpl(CSSNode *node,
// For content (text) nodes, determine the dimensions based on the text // For content (text) nodes, determine the dimensions based on the text
// contents. // contents.
if (isMeasureDefined(node)) { if (node->measure) {
float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow; float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn; float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
@@ -985,11 +973,11 @@ static void layoutNodeImpl(CSSNode *node,
} }
// STEP 1: CALCULATE VALUES FOR REMAINDER OF ALGORITHM // STEP 1: CALCULATE VALUES FOR REMAINDER OF ALGORITHM
CSSFlexDirection mainAxis = resolveAxis(getFlexDirection(node), direction); CSSFlexDirection mainAxis = resolveAxis(node->style.flexDirection, direction);
CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction); CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction);
bool isMainAxisRow = isRowDirection(mainAxis); bool isMainAxisRow = isRowDirection(mainAxis);
CSSJustify justifyContent = node->style.justifyContent; CSSJustify justifyContent = node->style.justifyContent;
bool isNodeFlexWrap = isFlexWrap(node); bool isNodeFlexWrap = node->style.flexWrap == CSSWrapTypeWrap;
CSSNode *firstAbsoluteChild = NULL; CSSNode *firstAbsoluteChild = NULL;
CSSNode *currentAbsoluteChild = NULL; CSSNode *currentAbsoluteChild = NULL;
@@ -2023,7 +2011,7 @@ bool layoutNodeInternal(CSSNode *node,
// most // most
// expensive to measure, so it's worth avoiding redundant measurements if at // expensive to measure, so it's worth avoiding redundant measurements if at
// all possible. // all possible.
if (isMeasureDefined(node)) { if (node->measure) {
float marginAxisRow = getMarginAxis(node, CSSFlexDirectionRow); float marginAxisRow = getMarginAxis(node, CSSFlexDirectionRow);
float marginAxisColumn = getMarginAxis(node, CSSFlexDirectionColumn); float marginAxisColumn = getMarginAxis(node, CSSFlexDirectionColumn);