From dc859ca28ef3e6a305119fe8ac190f33e01ff5e8 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Sep 2015 14:59:04 -0700 Subject: [PATCH] Revert "MultiChildRenderObjectWrapper should take an Iterable instead of a List" This reverts commit 7592213df29066cd357eaa4fffe4a19ed3bae189. --- packages/flutter/lib/src/rendering/auto_layout.dart | 2 +- packages/flutter/lib/src/rendering/block.dart | 6 +++--- packages/flutter/lib/src/rendering/flex.dart | 2 +- packages/flutter/lib/src/rendering/grid.dart | 2 +- packages/flutter/lib/src/rendering/object.dart | 2 +- packages/flutter/lib/src/rendering/stack.dart | 2 +- packages/flutter/lib/src/widgets/basic.dart | 12 ++++++------ 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/flutter/lib/src/rendering/auto_layout.dart b/packages/flutter/lib/src/rendering/auto_layout.dart index 2dcb09a042..150f7f4f7e 100644 --- a/packages/flutter/lib/src/rendering/auto_layout.dart +++ b/packages/flutter/lib/src/rendering/auto_layout.dart @@ -126,7 +126,7 @@ class RenderAutoLayout extends RenderBox RenderBoxContainerDefaultsMixin, _AutoLayoutParamMixin { - RenderAutoLayout({ Iterable children }) { + RenderAutoLayout({ List children }) { _setupLayoutParameters(this); _setupEditVariablesInSolver(_solver, al.Priority.required - 1); addAll(children); diff --git a/packages/flutter/lib/src/rendering/block.dart b/packages/flutter/lib/src/rendering/block.dart index d12c2af4f7..91e49a9d19 100644 --- a/packages/flutter/lib/src/rendering/block.dart +++ b/packages/flutter/lib/src/rendering/block.dart @@ -35,7 +35,7 @@ abstract class RenderBlockBase extends RenderBox with ContainerRenderObjectMixin RenderBoxContainerDefaultsMixin { RenderBlockBase({ - Iterable children, + List children, BlockDirection direction: BlockDirection.vertical, double itemExtent, double minExtent: 0.0 @@ -123,7 +123,7 @@ abstract class RenderBlockBase extends RenderBox with ContainerRenderObjectMixin class RenderBlock extends RenderBlockBase { RenderBlock({ - Iterable children, + List children, BlockDirection direction: BlockDirection.vertical, double itemExtent, double minExtent: 0.0 @@ -231,7 +231,7 @@ class RenderBlockViewport extends RenderBlockBase { double itemExtent, double minExtent: 0.0, double startOffset: 0.0, - Iterable children + List children }) : _callback = callback, _totalExtentCallback = totalExtentCallback, _maxCrossAxisExtentCallback = maxCrossAxisDimensionCallback, diff --git a/packages/flutter/lib/src/rendering/flex.dart b/packages/flutter/lib/src/rendering/flex.dart index 369ee7252a..a7e7341d64 100644 --- a/packages/flutter/lib/src/rendering/flex.dart +++ b/packages/flutter/lib/src/rendering/flex.dart @@ -85,7 +85,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin { RenderFlex({ - Iterable children, + List children, FlexDirection direction: FlexDirection.horizontal, FlexJustifyContent justifyContent: FlexJustifyContent.start, FlexAlignItems alignItems: FlexAlignItems.center, diff --git a/packages/flutter/lib/src/rendering/grid.dart b/packages/flutter/lib/src/rendering/grid.dart index f08377a067..b07eca7a3d 100644 --- a/packages/flutter/lib/src/rendering/grid.dart +++ b/packages/flutter/lib/src/rendering/grid.dart @@ -52,7 +52,7 @@ class GridParentData extends BoxParentData with ContainerParentDataMixin, RenderBoxContainerDefaultsMixin { - RenderGrid({ Iterable children, double maxChildExtent }) { + RenderGrid({ List children, double maxChildExtent }) { addAll(children); _maxChildExtent = maxChildExtent; } diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart index bb97bb59ce..fbcb142912 100644 --- a/packages/flutter/lib/src/rendering/object.dart +++ b/packages/flutter/lib/src/rendering/object.dart @@ -1230,7 +1230,7 @@ abstract class ContainerRenderObjectMixin children) { + void addAll(List children) { if (children != null) for (ChildType child in children) add(child); diff --git a/packages/flutter/lib/src/rendering/stack.dart b/packages/flutter/lib/src/rendering/stack.dart index e306ceb81a..0ea40b060c 100644 --- a/packages/flutter/lib/src/rendering/stack.dart +++ b/packages/flutter/lib/src/rendering/stack.dart @@ -68,7 +68,7 @@ class StackParentData extends BoxParentData with ContainerParentDataMixin, RenderBoxContainerDefaultsMixin { RenderStack({ - Iterable children + List children }) { addAll(children); } diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 2643c87808..7eafdc56d1 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -473,7 +473,7 @@ class Container extends Component { // LAYOUT NODES class BlockBody extends MultiChildRenderObjectWrapper { - BlockBody(Iterable children, { + BlockBody(List children, { Key key, this.direction: BlockDirection.vertical }) : super(key: key, children: children) { @@ -492,7 +492,7 @@ class BlockBody extends MultiChildRenderObjectWrapper { } class Stack extends MultiChildRenderObjectWrapper { - Stack(Iterable children, { Key key }) + Stack(List children, { Key key }) : super(key: key, children: children); RenderStack createNode() => new RenderStack(); @@ -555,7 +555,7 @@ class Positioned extends ParentDataNode { } class Grid extends MultiChildRenderObjectWrapper { - Grid(Iterable children, { Key key, this.maxChildExtent }) + Grid(List children, { Key key, this.maxChildExtent }) : super(key: key, children: children) { assert(maxChildExtent != null); } @@ -572,7 +572,7 @@ class Grid extends MultiChildRenderObjectWrapper { } class Flex extends MultiChildRenderObjectWrapper { - Flex(Iterable children, { + Flex(List children, { Key key, this.direction: FlexDirection.horizontal, this.justifyContent: FlexJustifyContent.start, @@ -615,7 +615,7 @@ class Flex extends MultiChildRenderObjectWrapper { } class Row extends Flex { - Row(Iterable children, { + Row(List children, { Key key, justifyContent: FlexJustifyContent.start, alignItems: FlexAlignItems.center, @@ -624,7 +624,7 @@ class Row extends Flex { } class Column extends Flex { - Column(Iterable children, { + Column(List children, { Key key, justifyContent: FlexJustifyContent.start, alignItems: FlexAlignItems.center,