From 06ee8329285c13a7fb128656d708c8f2e8fffe11 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Thu, 25 Aug 2016 15:28:43 -0700
Subject: [PATCH] Generate tests for flex properties

Differential Revision: D3771513

fbshipit-source-id: 1b5edc7a28bb26217e8a6d10d1829d9031c3ae2e
---
 React/CSSLayout/CSSLayout.c                                    | 3 +--
 .../src/main/java/com/facebook/csslayout/LayoutEngine.java     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/React/CSSLayout/CSSLayout.c b/React/CSSLayout/CSSLayout.c
index c8fb96734ad..d49acc02eb7 100644
--- a/React/CSSLayout/CSSLayout.c
+++ b/React/CSSLayout/CSSLayout.c
@@ -1040,8 +1040,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
         child->layout.computedFlexBasis =
             fmaxf(child->style.dimensions[CSSDimensionHeight],
                   getPaddingAndBorderAxis(child, CSSFlexDirectionColumn));
-      } else if (!CSSValueIsUndefined(child->style.flexBasis) &&
-                 !CSSValueIsUndefined(availableInnerMainDim)) {
+      } else if (!CSSValueIsUndefined(child->style.flexBasis)) {
         child->layout.computedFlexBasis =
             fmaxf(child->style.flexBasis, getPaddingAndBorderAxis(child, mainAxis));
       } else {
diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/LayoutEngine.java b/ReactAndroid/src/main/java/com/facebook/csslayout/LayoutEngine.java
index f704879af5d..e7108f08e8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/csslayout/LayoutEngine.java
+++ b/ReactAndroid/src/main/java/com/facebook/csslayout/LayoutEngine.java
@@ -694,7 +694,7 @@ public class LayoutEngine {
 
           // The height is definite, so use that as the flex basis.
           child.layout.computedFlexBasis = Math.max(child.style.dimensions[DIMENSION_HEIGHT], ((child.style.padding.getWithFallback(leadingSpacing[CSS_FLEX_DIRECTION_COLUMN], leading[CSS_FLEX_DIRECTION_COLUMN]) + child.style.border.getWithFallback(leadingSpacing[CSS_FLEX_DIRECTION_COLUMN], leading[CSS_FLEX_DIRECTION_COLUMN])) + (child.style.padding.getWithFallback(trailingSpacing[CSS_FLEX_DIRECTION_COLUMN], trailing[CSS_FLEX_DIRECTION_COLUMN]) + child.style.border.getWithFallback(trailingSpacing[CSS_FLEX_DIRECTION_COLUMN], trailing[CSS_FLEX_DIRECTION_COLUMN]))));
-        } else if (!isFlexBasisAuto(child) && !Float.isNaN(availableInnerMainDim)) {
+        } else if (!isFlexBasisAuto(child)) {
 
           // If the basis isn't 'auto', it is assumed to be zero.
           child.layout.computedFlexBasis = Math.max(child.style.flexBasis, ((child.style.padding.getWithFallback(leadingSpacing[mainAxis], leading[mainAxis]) + child.style.border.getWithFallback(leadingSpacing[mainAxis], leading[mainAxis])) + (child.style.padding.getWithFallback(trailingSpacing[mainAxis], trailing[mainAxis]) + child.style.border.getWithFallback(trailingSpacing[mainAxis], trailing[mainAxis]))));