From 1decf879f860bc86860cf8a60408aaf090e17cf4 Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Wed, 12 Dec 2018 16:11:46 -0800 Subject: [PATCH] Back out "[yoga][PR] Fix aspect ratio when stretching with main axis margin" Summary: Original commit changeset: 6970e6072e79 Reviewed By: mdvacca Differential Revision: D13437552 fbshipit-source-id: 65a55d716da6b6582e38efa906d3f540e58418bf --- ReactCommon/yoga/yoga/Yoga.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index 6bc264a1a..6abfb7d31 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -1382,16 +1382,6 @@ static void YGNodeComputeFlexBasisForChild( auto marginColumn = YGUnwrapFloatOptional( child->getMarginForAxis(YGFlexDirectionColumn, ownerWidth)); - if (YGNodeAlignItem(node, child) == YGAlignStretch) { - if (isMainAxisRow && !YGFloatIsUndefined(height)) { - childHeight = height; - childHeightMeasureMode = YGMeasureModeExactly; - } else if (!isMainAxisRow && !YGFloatIsUndefined(width)) { - childWidth = width; - childWidthMeasureMode = YGMeasureModeExactly; - } - } - if (isRowStyleDimDefined) { childWidth = YGUnwrapFloatOptional(YGResolveValue(