From 0ab97667865df228af52e127879e1577bce92f41 Mon Sep 17 00:00:00 2001
From: Hixie <github.com@spam.hixie.ch>
Date: Thu, 23 Jul 2015 09:05:57 -0700
Subject: [PATCH] RenderConstrainedBox was ignoring its additional constraints
 for its intrinsic size logic when it had no child.

---
 sky/sdk/lib/rendering/box.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sky/sdk/lib/rendering/box.dart b/sky/sdk/lib/rendering/box.dart
index eafd40d1e150a..efe1cd984dce5 100644
--- a/sky/sdk/lib/rendering/box.dart
+++ b/sky/sdk/lib/rendering/box.dart
@@ -558,25 +558,25 @@ class RenderConstrainedBox extends RenderProxyBox {
   double getMinIntrinsicWidth(BoxConstraints constraints) {
     if (child != null)
       return child.getMinIntrinsicWidth(_additionalConstraints.apply(constraints));
-    return constraints.constrainWidth(0.0);
+    return _additionalConstraints.apply(constraints).constrainWidth(0.0);
   }
 
   double getMaxIntrinsicWidth(BoxConstraints constraints) {
     if (child != null)
       return child.getMaxIntrinsicWidth(_additionalConstraints.apply(constraints));
-    return constraints.constrainWidth(0.0);
+    return _additionalConstraints.apply(constraints).constrainWidth(0.0);
   }
 
   double getMinIntrinsicHeight(BoxConstraints constraints) {
     if (child != null)
       return child.getMinIntrinsicHeight(_additionalConstraints.apply(constraints));
-    return constraints.constrainHeight(0.0);
+    return _additionalConstraints.apply(constraints).constrainHeight(0.0);
   }
 
   double getMaxIntrinsicHeight(BoxConstraints constraints) {
     if (child != null)
       return child.getMaxIntrinsicHeight(_additionalConstraints.apply(constraints));
-    return constraints.constrainHeight(0.0);
+    return _additionalConstraints.apply(constraints).constrainHeight(0.0);
   }
 
   void performLayout() {