From bb37e65ab156afc3dd59e88af7d9ae7342b15492 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Thu, 1 Dec 2016 07:24:55 -0800
Subject: [PATCH] Fix error from refactor of
 setMeasuredDimensionsIfEmptyOrFixedSize

Summary: D4213339 refactored some code and some logic was missed where negative values should only be ignored for at most measurements.

Reviewed By: gkassabli

Differential Revision: D4258254

fbshipit-source-id: e22e36e67260114081e483527fc7ce378f7f0df9
---
 CSSLayout/CSSLayout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CSSLayout/CSSLayout.c b/CSSLayout/CSSLayout.c
index 5b102509..7067827a 100644
--- a/CSSLayout/CSSLayout.c
+++ b/CSSLayout/CSSLayout.c
@@ -1290,14 +1290,14 @@ static bool setMeasuredDimensionsIfEmptyOrFixedSize(const CSSNodeRef node,
     node->layout.measuredDimensions[CSSDimensionWidth] =
         boundAxis(node,
                   CSSFlexDirectionRow,
-                  CSSValueIsUndefined(availableWidth) || availableWidth < 0
+                  CSSValueIsUndefined(availableWidth) || (widthMeasureMode == CSSMeasureModeAtMost && availableWidth < 0)
                       ? 0
                       : availableWidth - marginAxisRow);
 
     node->layout.measuredDimensions[CSSDimensionHeight] =
         boundAxis(node,
                   CSSFlexDirectionColumn,
-                  CSSValueIsUndefined(availableHeight) || availableHeight < 0
+                  CSSValueIsUndefined(availableHeight) || (heightMeasureMode == CSSMeasureModeAtMost && availableHeight < 0)
                       ? 0
                       : availableHeight - marginAxisColumn);