Skip to content

Commit

Permalink
Revert "MultiChildRenderObjectWrapper should take an Iterable instead…
Browse files Browse the repository at this point in the history
… of a List"

This reverts commit 7592213.
  • Loading branch information
collinjackson committed Sep 14, 2015
1 parent 0651ab7 commit b858a44
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion sky/packages/sky/lib/src/rendering/auto_layout.dart
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class RenderAutoLayout extends RenderBox
RenderBoxContainerDefaultsMixin<RenderBox, AutoLayoutParentData>,
_AutoLayoutParamMixin {

RenderAutoLayout({ Iterable<RenderBox> children }) {
RenderAutoLayout({ List<RenderBox> children }) {
_setupLayoutParameters(this);
_setupEditVariablesInSolver(_solver, al.Priority.required - 1);
addAll(children);
Expand Down
6 changes: 3 additions & 3 deletions sky/packages/sky/lib/src/rendering/block.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ abstract class RenderBlockBase extends RenderBox with ContainerRenderObjectMixin
RenderBoxContainerDefaultsMixin<RenderBox, BlockParentData> {

RenderBlockBase({
Iterable<RenderBox> children,
List<RenderBox> children,
BlockDirection direction: BlockDirection.vertical,
double itemExtent,
double minExtent: 0.0
Expand Down Expand Up @@ -123,7 +123,7 @@ abstract class RenderBlockBase extends RenderBox with ContainerRenderObjectMixin
class RenderBlock extends RenderBlockBase {

RenderBlock({
Iterable<RenderBox> children,
List<RenderBox> children,
BlockDirection direction: BlockDirection.vertical,
double itemExtent,
double minExtent: 0.0
Expand Down Expand Up @@ -231,7 +231,7 @@ class RenderBlockViewport extends RenderBlockBase {
double itemExtent,
double minExtent: 0.0,
double startOffset: 0.0,
Iterable<RenderBox> children
List<RenderBox> children
}) : _callback = callback,
_totalExtentCallback = totalExtentCallback,
_maxCrossAxisExtentCallback = maxCrossAxisDimensionCallback,
Expand Down
2 changes: 1 addition & 1 deletion sky/packages/sky/lib/src/rendering/flex.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
RenderBoxContainerDefaultsMixin<RenderBox, FlexParentData> {

RenderFlex({
Iterable<RenderBox> children,
List<RenderBox> children,
FlexDirection direction: FlexDirection.horizontal,
FlexJustifyContent justifyContent: FlexJustifyContent.start,
FlexAlignItems alignItems: FlexAlignItems.center,
Expand Down
2 changes: 1 addition & 1 deletion sky/packages/sky/lib/src/rendering/grid.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class GridParentData extends BoxParentData with ContainerParentDataMixin<RenderB
/// the given [maxChildExtent].
class RenderGrid extends RenderBox with ContainerRenderObjectMixin<RenderBox, GridParentData>,
RenderBoxContainerDefaultsMixin<RenderBox, GridParentData> {
RenderGrid({ Iterable<RenderBox> children, double maxChildExtent }) {
RenderGrid({ List<RenderBox> children, double maxChildExtent }) {
addAll(children);
_maxChildExtent = maxChildExtent;
}
Expand Down
2 changes: 1 addition & 1 deletion sky/packages/sky/lib/src/rendering/object.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@ abstract class ContainerRenderObjectMixin<ChildType extends RenderObject, Parent
}

/// Add all the children to the end of this render object's child list
void addAll(Iterable<ChildType> children) {
void addAll(List<ChildType> children) {
if (children != null)
for (ChildType child in children)
add(child);
Expand Down
2 changes: 1 addition & 1 deletion sky/packages/sky/lib/src/rendering/stack.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class StackParentData extends BoxParentData with ContainerParentDataMixin<Render
class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, StackParentData>,
RenderBoxContainerDefaultsMixin<RenderBox, StackParentData> {
RenderStack({
Iterable<RenderBox> children
List<RenderBox> children
}) {
addAll(children);
}
Expand Down
12 changes: 6 additions & 6 deletions sky/packages/sky/lib/src/widgets/basic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ class Container extends Component {
// LAYOUT NODES

class BlockBody extends MultiChildRenderObjectWrapper {
BlockBody(Iterable<Widget> children, {
BlockBody(List<Widget> children, {
Key key,
this.direction: BlockDirection.vertical
}) : super(key: key, children: children) {
Expand All @@ -492,7 +492,7 @@ class BlockBody extends MultiChildRenderObjectWrapper {
}

class Stack extends MultiChildRenderObjectWrapper {
Stack(Iterable<Widget> children, { Key key })
Stack(List<Widget> children, { Key key })
: super(key: key, children: children);

RenderStack createNode() => new RenderStack();
Expand Down Expand Up @@ -555,7 +555,7 @@ class Positioned extends ParentDataNode {
}

class Grid extends MultiChildRenderObjectWrapper {
Grid(Iterable<Widget> children, { Key key, this.maxChildExtent })
Grid(List<Widget> children, { Key key, this.maxChildExtent })
: super(key: key, children: children) {
assert(maxChildExtent != null);
}
Expand All @@ -572,7 +572,7 @@ class Grid extends MultiChildRenderObjectWrapper {
}

class Flex extends MultiChildRenderObjectWrapper {
Flex(Iterable<Widget> children, {
Flex(List<Widget> children, {
Key key,
this.direction: FlexDirection.horizontal,
this.justifyContent: FlexJustifyContent.start,
Expand Down Expand Up @@ -615,7 +615,7 @@ class Flex extends MultiChildRenderObjectWrapper {
}

class Row extends Flex {
Row(Iterable<Widget> children, {
Row(List<Widget> children, {
Key key,
justifyContent: FlexJustifyContent.start,
alignItems: FlexAlignItems.center,
Expand All @@ -624,7 +624,7 @@ class Row extends Flex {
}

class Column extends Flex {
Column(Iterable<Widget> children, {
Column(List<Widget> children, {
Key key,
justifyContent: FlexJustifyContent.start,
alignItems: FlexAlignItems.center,
Expand Down

0 comments on commit b858a44

Please sign in to comment.