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

Merge pull request #70 from tadeuzagallo/remove-dead-code

Browse Source 
Remove unused code pointed by Xcode
This commit is contained in:
Christopher Chedeau
2015-05-05 08:10:04 -07:00
parent a8b7859613 aad5efe938
commit 3203e86155
3 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Layout.c
View File

@@ -704,19 +704,6 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth) {
} }
} }
float containerMainAxis = node->layout.dimensions[dim[mainAxis]];
// If the user didn't specify a width or height, and it has not been set
// by the container, then we set it via the children.
if (isUndefined(containerMainAxis)) {
containerMainAxis = fmaxf(
// We're missing the last padding at this point to get the final
// dimension
boundAxis(node, mainAxis, mainDim + getPaddingAndBorder(node, trailing[mainAxis])),
// We can never assign a width smaller than the padding and borders
getPaddingAndBorderAxis(node, mainAxis)
);
}
float containerCrossAxis = node->layout.dimensions[dim[crossAxis]]; float containerCrossAxis = node->layout.dimensions[dim[crossAxis]];
if (isUndefined(node->layout.dimensions[dim[crossAxis]])) { if (isUndefined(node->layout.dimensions[dim[crossAxis]])) {
containerCrossAxis = fmaxf( containerCrossAxis = fmaxf(

13
src/Layout.js
View File

@@ -588,19 +588,6 @@ var computeLayout = (function() {
} }
} }
var/*float*/ containerMainAxis = node.layout[dim[mainAxis]];
// If the user didn't specify a width or height, and it has not been set
// by the container, then we set it via the children.
if (isUndefined(containerMainAxis)) {
containerMainAxis = fmaxf(
// We're missing the last padding at this point to get the final
// dimension
boundAxis(node, mainAxis, mainDim + getPaddingAndBorder(node, trailing[mainAxis])),
// We can never assign a width smaller than the padding and borders
getPaddingAndBorderAxis(node, mainAxis)
);
}
var/*float*/ containerCrossAxis = node.layout[dim[crossAxis]]; var/*float*/ containerCrossAxis = node.layout[dim[crossAxis]];
if (isUndefined(node.layout[dim[crossAxis]])) { if (isUndefined(node.layout[dim[crossAxis]])) {
containerCrossAxis = fmaxf( containerCrossAxis = fmaxf(

13
src/java/src/com/facebook/csslayout/LayoutEngine.java
View File

@@ -642,19 +642,6 @@ public class LayoutEngine {
} }
} }
float containerMainAxis = getLayoutDimension(node, getDim(mainAxis));
// If the user didn't specify a width or height, and it has not been set
// by the container, then we set it via the children.
if (CSSConstants.isUndefined(containerMainAxis)) {
containerMainAxis = Math.max(
// We're missing the last padding at this point to get the final
// dimension
boundAxis(node, mainAxis, mainDim + getPaddingAndBorder(node, getTrailing(mainAxis))),
// We can never assign a width smaller than the padding and borders
getPaddingAndBorderAxis(node, mainAxis)
);
}
float containerCrossAxis = getLayoutDimension(node, getDim(crossAxis)); float containerCrossAxis = getLayoutDimension(node, getDim(crossAxis));
if (CSSConstants.isUndefined(getLayoutDimension(node, getDim(crossAxis)))) { if (CSSConstants.isUndefined(getLayoutDimension(node, getDim(crossAxis)))) {
containerCrossAxis = Math.max( containerCrossAxis = Math.max(