From d94363ea7e768004a1066f0ea8c6e5f53d6084c3 Mon Sep 17 00:00:00 2001 From: Dustin Shahidehpour Date: Wed, 2 Nov 2016 17:05:06 -0700 Subject: [PATCH] Cleanup Measure method. Summary: We have redundant/dead code in UIKit's sizing method, lets clean it up. Reviewed By: emilsjolander Differential Revision: D4110939 fbshipit-source-id: 35e856aa6c60fd24316bc67cc564f7eec2d9d714 --- uikit/CSSLayout/UIView+CSSLayout.m | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/uikit/CSSLayout/UIView+CSSLayout.m b/uikit/CSSLayout/UIView+CSSLayout.m index f4468bab..da5a0172 100644 --- a/uikit/CSSLayout/UIView+CSSLayout.m +++ b/uikit/CSSLayout/UIView+CSSLayout.m @@ -209,10 +209,7 @@ static CSSSize _measure( float height, CSSMeasureMode heightMode) { - const BOOL useExactWidth = (widthMode == CSSMeasureModeExactly); - const BOOL useExactHeight = (heightMode == CSSMeasureModeExactly); - - if (useExactHeight && useExactWidth) { + if ((widthMode == CSSMeasureModeExactly) && (heightMode == CSSMeasureModeExactly)) { return (CSSSize) { .width = width, .height = height, @@ -226,8 +223,8 @@ static CSSSize _measure( }]; return (CSSSize) { - .width = useExactWidth ? width : sizeThatFits.width, - .height = useExactHeight ? height : sizeThatFits.height, + .width = sizeThatFits.width, + .height = sizeThatFits.height, }; }