Remove RenderSizedBox.

sky/sdk/lib/rendering/box.dart

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
 import 'package:vector_math/vector_math.dart';
 
 import '../framework/debug/utils.dart';
@@ skipping 54 matching lines @@
     this.minHeight: 0.0,
     this.maxHeight: double.INFINITY
   });
 
   BoxConstraints.tight(Size size)
     : minWidth = size.width,
       maxWidth = size.width,
       minHeight = size.height,
       maxHeight = size.height;
 
+  BoxConstraints.tightFor({
+    double width,
+    double height
+  }): minWidth = width != null ? width : 0.0,
+      maxWidth = width != null ? width : double.INFINITY,
+      minHeight = height != null ? height : 0.0,
+      maxHeight = height != null ? height : double.INFINITY;
+
   BoxConstraints.loose(Size size)
     : minWidth = 0.0,
       maxWidth = size.width,
       minHeight = 0.0,
       maxHeight = size.height;
 
   BoxConstraints deflate(EdgeDims edges) {
     assert(edges != null);
     double horizontal = edges.left + edges.right;
     double vertical = edges.top + edges.bottom;
     return new BoxConstraints(
       minWidth: math.max(0.0, minWidth - horizontal),
       maxWidth: maxWidth - horizontal,
       minHeight: math.max(0.0, minHeight - vertical),
       maxHeight: maxHeight - vertical
     );
   }
 
   BoxConstraints loosen() {
     return new BoxConstraints(
       minWidth: 0.0,
       maxWidth: maxWidth,
       minHeight: 0.0,
       maxHeight: maxHeight
     );
   }
 
   BoxConstraints apply(BoxConstraints constraints) {
     return new BoxConstraints(
-      minWidth: math.max(minWidth, constraints.minWidth),
-      maxWidth: math.min(maxWidth, constraints.maxWidth),
-      minHeight: math.max(minHeight, constraints.minHeight),
-      maxHeight: math.min(maxHeight, constraints.maxHeight));
+      minWidth: clamp(min: constraints.minWidth, max: constraints.maxWidth, value: minWidth),
+      maxWidth: clamp(min: constraints.minWidth, max: constraints.maxWidth, value: maxWidth),
+      minHeight: clamp(min: constraints.minHeight, max: constraints.maxHeight, value: minHeight),
+      maxHeight: clamp(min: constraints.minHeight, max: constraints.maxHeight, value: maxHeight)
+    );
   }
 
   BoxConstraints applyWidth(double width) {
-    return new BoxConstraints(minWidth: math.max(minWidth, width),
-                              maxWidth: math.min(maxWidth, width),
+    return new BoxConstraints(minWidth: math.max(math.min(maxWidth, width), minWidth),
+                              maxWidth: math.max(math.min(maxWidth, width), minWidth),
                               minHeight: minHeight,
                               maxHeight: maxHeight);
   }
 
-  BoxConstraints applyMinWidth(double width) {
-    return new BoxConstraints(minWidth: math.max(minWidth, width),
-                              maxWidth: maxWidth,
+  BoxConstraints applyMinWidth(double newMinWidth) {
+    return new BoxConstraints(minWidth: math.max(minWidth, newMinWidth),
+                              maxWidth: math.max(maxWidth, newMinWidth),
                               minHeight: minHeight,
                               maxHeight: maxHeight);
   }
 
-  BoxConstraints applyMaxWidth(double width) {
+  BoxConstraints applyMaxWidth(double newMaxWidth) {
     return new BoxConstraints(minWidth: minWidth,
-                              maxWidth: math.min(maxWidth, width),
+                              maxWidth: math.min(maxWidth, newMaxWidth),
                               minHeight: minHeight,
                               maxHeight: maxHeight);
   }
 
   BoxConstraints applyHeight(double height) {
     return new BoxConstraints(minWidth: minWidth,
                               maxWidth: maxWidth,
-                              minHeight: math.max(minHeight, height),
-                              maxHeight: math.min(maxHeight, height));
+                              minHeight: math.max(math.min(maxHeight, height), minHeight),
+                              maxHeight: math.max(math.min(maxHeight, height), minHeight));
   }
 
-  BoxConstraints applyMinHeight(double height) {
+  BoxConstraints applyMinHeight(double newMinHeight) {
     return new BoxConstraints(minWidth: minWidth,
                               maxWidth: maxWidth,
-                              minHeight: math.max(minHeight, height),
-                              maxHeight: maxHeight);
+                              minHeight: math.max(minHeight, newMinHeight),
+                              maxHeight: math.max(maxHeight, newMinHeight));
   }
 
-  BoxConstraints applyMaxHeight(double height) {
+  BoxConstraints applyMaxHeight(double newMaxHeight) {
     return new BoxConstraints(minWidth: minWidth,
                               maxWidth: maxWidth,
                               minHeight: minHeight,
-                              maxHeight: math.min(maxHeight, height));
+                              maxHeight: math.min(maxHeight, newMaxHeight));
   }
 
   final double minWidth;
   final double maxWidth;
   final double minHeight;
   final double maxHeight;
 
   double constrainWidth(double width) {
     return clamp(min: minWidth, max: maxWidth, value: width);
   }
@@ skipping 178 matching lines @@
       super.hitTestChildren(result, position: position);
   }
 
   void paint(RenderObjectDisplayList canvas) {
     if (child != null)
       child.paint(canvas);
   }
 
 }
 
-class RenderSizedBox extends RenderProxyBox {
-
-  RenderSizedBox({
-    RenderBox child,
-    Size desiredSize: Size.infinite
-  }) : super(child), _desiredSize = desiredSize {
-    assert(desiredSize != null);
-  }
-
-  Size _desiredSize;
-  Size get desiredSize => _desiredSize;
-  void set desiredSize (Size value) {
-    assert(value != null);
-    if (_desiredSize == value)
-      return;
-    _desiredSize = value;
-    markNeedsLayout();
-  }
-
-  double getMinIntrinsicWidth(BoxConstraints constraints) {
-    return constraints.constrainWidth(_desiredSize.width);
-  }
-
-  double getMaxIntrinsicWidth(BoxConstraints constraints) {
-    return constraints.constrainWidth(_desiredSize.width);
-  }
-
-  double getMinIntrinsicHeight(BoxConstraints constraints) {
-    return constraints.constrainHeight(_desiredSize.height);
-  }
-
-  double getMaxIntrinsicHeight(BoxConstraints constraints) {
-    return constraints.constrainHeight(_desiredSize.height);
-  }
-
-  void performLayout() {
-    size = constraints.constrain(_desiredSize);
-    if (child != null)
-      child.layout(new BoxConstraints.tight(size));
-  }
-
-  String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(prefix)}${prefix}desiredSize: ${desiredSize}\n';
-}
-
 class RenderConstrainedBox extends RenderProxyBox {
   RenderConstrainedBox({
     RenderBox child,
     BoxConstraints additionalConstraints
   }) : super(child), _additionalConstraints = additionalConstraints {
     assert(additionalConstraints != null);
   }
 
   BoxConstraints _additionalConstraints;
   BoxConstraints get additionalConstraints => _additionalConstraints;
   void set additionalConstraints (BoxConstraints value) {
     assert(value != null);
     if (_additionalConstraints == value)
       return;
     _additionalConstraints = value;
     markNeedsLayout();
   }
 
   double getMinIntrinsicWidth(BoxConstraints constraints) {
     if (child != null)
-      return child.getMinIntrinsicWidth(constraints.apply(_additionalConstraints));
+      return child.getMinIntrinsicWidth(_additionalConstraints.apply(constraints));
     return constraints.constrainWidth(0.0);
   }
 
   double getMaxIntrinsicWidth(BoxConstraints constraints) {
     if (child != null)
-      return child.getMaxIntrinsicWidth(constraints.apply(_additionalConstraints));
+      return child.getMaxIntrinsicWidth(_additionalConstraints.apply(constraints));
     return constraints.constrainWidth(0.0);
   }
 
   double getMinIntrinsicHeight(BoxConstraints constraints) {
     if (child != null)
-      return child.getMinIntrinsicHeight(constraints.apply(_additionalConstraints));
+      return child.getMinIntrinsicHeight(_additionalConstraints.apply(constraints));
     return constraints.constrainHeight(0.0);
   }
 
   double getMaxIntrinsicHeight(BoxConstraints constraints) {
     if (child != null)
-      return child.getMaxIntrinsicHeight(constraints.apply(_additionalConstraints));
+      return child.getMaxIntrinsicHeight(_additionalConstraints.apply(constraints));
     return constraints.constrainHeight(0.0);
   }
 
   void performLayout() {
     if (child != null) {
-      child.layout(constraints.apply(_additionalConstraints), parentUsesSize: true);
+      child.layout(_additionalConstraints.apply(constraints), parentUsesSize: true);
       size = child.size;
     } else {
-      performResize();
+      size = _additionalConstraints.apply(constraints).constrain(Size.zero);
     }
   }
 
   String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(prefix)}${prefix}additionalConstraints: ${additionalConstraints}\n';
 }
 
 class RenderShrinkWrapWidth extends RenderProxyBox {
   RenderShrinkWrapWidth({ RenderBox child }) : super(child);
 
   BoxConstraints _getInnerConstraints(BoxConstraints constraints) {
@@ skipping 628 matching lines @@
 
   void defaultPaint(RenderObjectDisplayList canvas) {
     RenderBox child = firstChild;
     while (child != null) {
       assert(child.parentData is ParentDataType);
       canvas.paintChild(child, child.parentData.position);
       child = child.parentData.nextSibling;
     }
   }
 }