Replace BoxDimensions with sky.Size

sky/sdk/lib/framework/layout2.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 'node.dart';
 import 'dart:sky' as sky;
 
 // ABSTRACT LAYOUT
 
 class ParentData {
@@ skipping 434 matching lines @@
     return clamp(min: minHeight, max: maxHeight, value: height);
   }
 
   sky.Size constrain(sky.Size size) {
     return new sky.Size(constrainWidth(size.width), constrainHeight(size.height));
   }
 
   bool get isInfinite => maxWidth >= double.INFINITY || maxHeight >= double.INFINITY;
 }
 
-// TODO(abarth): Replace with sky.Size.
-class BoxDimensions {
-  const BoxDimensions({ this.width: 0.0, this.height: 0.0 });
-
-  BoxDimensions.withConstraints(
-    BoxConstraints constraints,
-    { double width: 0.0, double height: 0.0 }
-  ) : width = constraints.constrainWidth(width),
-      height = constraints.constrainHeight(height);
-
-  final double width;
-  final double height;
-}
-
 class BoxParentData extends ParentData {
   sky.Point position = new sky.Point(0.0, 0.0);
 }
 
 abstract class RenderBox extends RenderNode {
 
   void setParentData(RenderNode child) {
     if (child.parentData is! BoxParentData)
       child.parentData = new BoxParentData();
   }
 
   // override this to report what dimensions you would have if you
   // were laid out with the given constraints this can walk the tree
   // if it must, but it should be as cheap as possible; just get the
   // dimensions and nothing else (e.g. don't calculate hypothetical
   // child positions if they're not needed to determine dimensions)
-  BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
-    return new BoxDimensions.withConstraints(constraints);
+  sky.Size getIntrinsicDimensions(BoxConstraints constraints) {
+    return constraints.constrain(new sky.Size(0.0, 0.0));
   }
 
   BoxConstraints get constraints => super.constraints as BoxConstraints;
   void performResize() {
     // default behaviour for subclasses that have sizedByParent = true
     size = constraints.constrain(new sky.Size(0.0, 0.0));
     assert(size.height < double.INFINITY);
     assert(size.width < double.INFINITY);
   }
   void performLayout() {
@@ skipping 11 matching lines @@
   void hitTestChildren(HitTestResult result, { sky.Point position }) { }
 
   sky.Size size = new sky.Size(0.0, 0.0);
 }
 
 abstract class RenderProxyBox extends RenderBox with RenderNodeWithChildMixin<RenderBox> {
   RenderProxyBox(RenderBox child) {
     this.child = child;
   }
 
-  BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
+  sky.Size getIntrinsicDimensions(BoxConstraints constraints) {
     return child.getIntrinsicDimensions(constraints);
   }
 
   void performLayout() {
     child.layout(constraints, parentUsesSize: true);
     size = child.size;
   }
 
   void hitTestChildren(HitTestResult result, { sky.Point position }) {
     child.hitTest(result, position: position);
   }
 
   void paint(RenderNodeDisplayList canvas) {
     child.paint(canvas);
   }
 }
 
 class RenderSizedBox extends RenderProxyBox {
   final sky.Size desiredSize;
 
   RenderSizedBox(RenderBox child, [this.desiredSize = const sky.Size.infinite()])
       : super(child);
 
-  BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
-    return new BoxDimensions.withConstraints(constraints,
-                                             width: desiredSize.width,
-                                             height: desiredSize.height);
+  sky.Size getIntrinsicDimensions(BoxConstraints constraints) {
+    return constraints.constrain(desiredSize);
   }
 
   void performLayout() {
     size = constraints.constrain(desiredSize);
     child.layout(new BoxConstraints.tight(size));
   }
 }
 
 class RenderPadding extends RenderBox with RenderNodeWithChildMixin<RenderBox> {
 
   RenderPadding(EdgeDims padding, RenderBox child) {
     assert(padding != null);
     this.padding = padding;
     this.child = child;
   }
 
   EdgeDims _padding;
   EdgeDims get padding => _padding;
   void set padding (EdgeDims value) {
     assert(value != null);
     if (_padding != value) {
       _padding = value;
       markNeedsLayout();
     }
   }
 
-  BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
+  sky.Size getIntrinsicDimensions(BoxConstraints constraints) {
     assert(padding != null);
     constraints = constraints.deflate(padding);
     if (child == null)
       return super.getIntrinsicDimensions(constraints);
     return child.getIntrinsicDimensions(constraints);
   }
 
   void performLayout() {
     assert(padding != null);
     BoxConstraints innerConstraints = constraints.deflate(padding);
@@ skipping 215 matching lines @@
   void setParentData(RenderBox child) {
     if (child.parentData is! BlockParentData)
       child.parentData = new BlockParentData();
   }
 
   // override this to report what dimensions you would have if you
   // were laid out with the given constraints this can walk the tree
   // if it must, but it should be as cheap as possible; just get the
   // dimensions and nothing else (e.g. don't calculate hypothetical
   // child positions if they're not needed to determine dimensions)
-  BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
-    double outerHeight = 0.0;
-    double outerWidth = constraints.constrainWidth(constraints.maxWidth);
-    assert(outerWidth < double.INFINITY);
-    double innerWidth = outerWidth;
+  sky.Size getIntrinsicDimensions(BoxConstraints constraints) {
+    double height = 0.0;
+    double width = constraints.constrainWidth(constraints.maxWidth);
+    assert(width < double.INFINITY);
     RenderBox child = firstChild;
-    BoxConstraints innerConstraints = new BoxConstraints(minWidth: innerWidth,
-                                                         maxWidth: innerWidth);
+    BoxConstraints innerConstraints = new BoxConstraints(minWidth: width,
+                                                         maxWidth: width);
     while (child != null) {
-      outerHeight += child.getIntrinsicDimensions(innerConstraints).height;
+      height += child.getIntrinsicDimensions(innerConstraints).height;
       assert(child.parentData is BlockParentData);
       child = child.parentData.nextSibling;
     }
 
-    return new BoxDimensions(width: outerWidth,
-                             height: constraints.constrainHeight(outerHeight));
+    return new sky.Size(width, constraints.constrainHeight(height));
   }
 
   void performLayout() {
     assert(constraints is BoxConstraints);
     double width = constraints.constrainWidth(constraints.maxWidth);
     double y = 0.0;
     RenderBox child = firstChild;
     while (child != null) {
       child.layout(new BoxConstraints(minWidth: width, maxWidth: width), parentUsesSize: true);
       assert(child.parentData is BlockParentData);
@@ skipping 156 matching lines @@
 
   void hitTestChildren(HitTestResult result, { double x, double y }) {
     // defaultHitTestChildren(result, x: x, y: y);
   }
 
   void paint(RenderNodeDisplayList canvas) {
     super.paint(canvas);
     _layoutRoot.paint(canvas);
   }
 }