                 // Go large.  For performance reasons, want to avoid a scrollRect 
                 // whenever possible in drawBackgroundAndSetScrollRect().  This is
                 // particularly true for 1 line TextInput components.
-                if (!isNaN(widthConstraint))
-                {
-                    measuredWidth = widthConstraint;
-                }
-                else
-                {                
-                    measuredWidth = !isNaN(explicitWidth) ? explicitWidth :
-                        Math.ceil(calculateWidthInChars());
-                }
-                
-                if (!isNaN(heightConstraint))
-                {            
-                    measuredHeight = heightConstraint;
-                }
-                else
-                {
-                    measuredHeight = !isNaN(explicitHeight) ? explicitHeight :
-                        Math.ceil(calculateHeightInLines());
-                }
+                measuredWidth = !isNaN(explicitWidth) ? explicitWidth :
+                    Math.ceil(calculateWidthInChars());
+                measuredHeight = !isNaN(explicitHeight) ? explicitHeight :
+                    Math.ceil(calculateHeightInLines());
             }
             else
             {

                // If so, the sizes are set so no need to remeasure now.
                if (!isNaN(explicitWidth) || !isNaN(_widthInChars))
                    return false;
                
                // Is there no height?
                if (height == 0)
                    return false;                
            }                       
            
            // Width or height is different than what was measured.  Since we're

            // remeasure which will reset autoSize.
            autoSize = false;
            
            // If no width or height, there is nothing to remeasure since 
            // there is no room for text.
            if (width == 0 || height == 0) 
                return false;
            
            if (!isNaN(widthConstraint))
            {
                // Do we have a constrained width and an explicit height?
