diff --git a/examples/raw/sector_layout.dart b/examples/raw/sector_layout.dart index 605009ac91780196efa864b6f6ea8de276f47e88..2b1d6a0c90af77ccd83b37c6f8a8a588c6d552e0 100644 --- a/examples/raw/sector_layout.dart +++ b/examples/raw/sector_layout.dart @@ -71,7 +71,7 @@ abstract class RenderSector extends RenderObject { return new SectorDimensions.withConstraints(constraints); } - SectorConstraints get constraints => super.constraints as SectorConstraints; + SectorConstraints get constraints { SectorConstraints result = super.constraints; return result; } void performResize() { // default behaviour for subclasses that have sizedByParent = true deltaRadius = constraints.constrainDeltaRadius(0.0); diff --git a/sdk/lib/framework/components2/ink_well.dart b/sdk/lib/framework/components2/ink_well.dart index 5501ed76fca7d6d792a2eecc1ab46023e0ff407e..ca7399695c01c6fccb031029a0cbd56801a81da0 100644 --- a/sdk/lib/framework/components2/ink_well.dart +++ b/sdk/lib/framework/components2/ink_well.dart @@ -104,7 +104,7 @@ class InkWellWrapper extends OneChildRenderObjectWrapper { InkWellWrapper({ UINode child, Object key }) : super(child: child, key: key); - RenderInkWell get root => super.root as RenderInkWell; + RenderInkWell get root { RenderInkWell result = super.root; return result; } RenderInkWell createNode() => new RenderInkWell(); } diff --git a/sdk/lib/framework/components2/scaffold.dart b/sdk/lib/framework/components2/scaffold.dart index 77af5858f291aea93def93410d7f6a4dda49ea91..1ba9107400e92f4239ceccaa472cceb6e808dac6 100644 --- a/sdk/lib/framework/components2/scaffold.dart +++ b/sdk/lib/framework/components2/scaffold.dart @@ -178,7 +178,7 @@ class Scaffold extends RenderObjectWrapper { UINode _drawer; UINode _floatingActionButton; - RenderScaffold get root => super.root as RenderScaffold; + RenderScaffold get root { RenderScaffold result = super.root; return result; } RenderScaffold createNode() => new RenderScaffold(); void insert(RenderObjectWrapper child, ScaffoldSlots slot) { diff --git a/sdk/lib/framework/fn2.dart b/sdk/lib/framework/fn2.dart index 5477800ccbcdafdd92ff6294d51e17bcb8c8c01f..994449538cdef559702f7cde54f1466f7c94bf5e 100644 --- a/sdk/lib/framework/fn2.dart +++ b/sdk/lib/framework/fn2.dart @@ -383,7 +383,7 @@ class Clip extends OneChildRenderObjectWrapper { Clip({ UINode child, Object key }) : super(child: child, key: key); - RenderClip get root => super.root as RenderClip; + RenderClip get root { RenderClip result = super.root; return result; } RenderClip createNode() => new RenderClip(); } @@ -393,7 +393,7 @@ class Padding extends OneChildRenderObjectWrapper { Padding({ this.padding, UINode child, Object key }) : super(child: child, key: key); - RenderPadding get root => super.root as RenderPadding; + RenderPadding get root { RenderPadding result = super.root; return result; } final EdgeDims padding; RenderPadding createNode() => new RenderPadding(padding: padding); @@ -410,7 +410,7 @@ class DecoratedBox extends OneChildRenderObjectWrapper { DecoratedBox({ this.decoration, UINode child, Object key }) : super(child: child, key: key); - RenderDecoratedBox get root => super.root as RenderDecoratedBox; + RenderDecoratedBox get root { RenderDecoratedBox result = super.root; return result; } final BoxDecoration decoration; RenderDecoratedBox createNode() => new RenderDecoratedBox(decoration: decoration); @@ -431,7 +431,7 @@ class SizedBox extends OneChildRenderObjectWrapper { Object key }) : desiredSize = new Size(width, height), super(child: child, key: key); - RenderSizedBox get root => super.root as RenderSizedBox; + RenderSizedBox get root { RenderSizedBox result = super.root; return result; } final Size desiredSize; RenderSizedBox createNode() => new RenderSizedBox(desiredSize: desiredSize); @@ -448,7 +448,7 @@ class ConstrainedBox extends OneChildRenderObjectWrapper { ConstrainedBox({ this.constraints, UINode child, Object key }) : super(child: child, key: key); - RenderConstrainedBox get root => super.root as RenderConstrainedBox; + RenderConstrainedBox get root { RenderConstrainedBox result = super.root; return result; } final BoxConstraints constraints; RenderConstrainedBox createNode() => new RenderConstrainedBox(additionalConstraints: constraints); @@ -464,7 +464,7 @@ class ShrinkWrapWidth extends OneChildRenderObjectWrapper { ShrinkWrapWidth({ UINode child, Object key }) : super(child: child, key: key); - RenderShrinkWrapWidth get root => super.root as RenderShrinkWrapWidth; + RenderShrinkWrapWidth get root { RenderShrinkWrapWidth result = super.root; return result; } RenderShrinkWrapWidth createNode() => new RenderShrinkWrapWidth(); @@ -475,7 +475,7 @@ class Transform extends OneChildRenderObjectWrapper { Transform({ this.transform, UINode child, Object key }) : super(child: child, key: key); - RenderTransform get root => super.root as RenderTransform; + RenderTransform get root { RenderTransform result = super.root; return result; } final Matrix4 transform; RenderTransform createNode() => new RenderTransform(transform: transform); @@ -492,7 +492,7 @@ class SizeObserver extends OneChildRenderObjectWrapper { SizeObserver({ this.callback, UINode child, Object key }) : super(child: child, key: key); - RenderSizeObserver get root => super.root as RenderSizeObserver; + RenderSizeObserver get root { RenderSizeObserver result = super.root; return result; } final SizeChangedCallback callback; RenderSizeObserver createNode() => new RenderSizeObserver(callback: callback); @@ -515,7 +515,7 @@ class CustomPaint extends OneChildRenderObjectWrapper { CustomPaint({ this.callback, UINode child, Object key }) : super(child: child, key: key); - RenderCustomPaint get root => super.root as RenderCustomPaint; + RenderCustomPaint get root { RenderCustomPaint result = super.root; return result; } final CustomPaintCallback callback; RenderCustomPaint createNode() => new RenderCustomPaint(callback: callback); @@ -722,7 +722,7 @@ class BlockContainer extends MultiChildRenderObjectWrapper { BlockContainer({ Object key, List children }) : super(key: key, children: children); - RenderBlock get root => super.root as RenderBlock; + RenderBlock get root { RenderBlock result = super.root; return result; } RenderBlock createNode() => new RenderBlock(); } @@ -732,7 +732,7 @@ class StackContainer extends MultiChildRenderObjectWrapper { StackContainer({ Object key, List children }) : super(key: key, children: children); - RenderStack get root => super.root as RenderStack; + RenderStack get root { RenderStack result = super.root; return result; } RenderStack createNode() => new RenderStack(); } @@ -750,7 +750,7 @@ class Paragraph extends RenderObjectWrapper { Paragraph({ Object key, this.text }) : super(key: key); - RenderParagraph get root => super.root as RenderParagraph; + RenderParagraph get root { RenderParagraph result = super.root; return result; } RenderParagraph createNode() => new RenderParagraph(text: text); final String text; @@ -776,7 +776,7 @@ class FlexContainer extends MultiChildRenderObjectWrapper { this.justifyContent: FlexJustifyContent.flexStart }) : super(key: key, children: children); - RenderFlex get root => super.root as RenderFlex; + RenderFlex get root { RenderFlex result = super.root; return result; } RenderFlex createNode() => new RenderFlex(direction: this.direction); final FlexDirection direction; @@ -803,7 +803,7 @@ class Image extends RenderObjectWrapper { this.size }) : super(key: key); - RenderImage get root => super.root as RenderImage; + RenderImage get root { RenderImage result = super.root; return result; } RenderImage createNode() => new RenderImage(this.src, this.size); final String src; diff --git a/sdk/lib/framework/rendering/box.dart b/sdk/lib/framework/rendering/box.dart index c25b9f62aefcc8c8156fa85e36c4b06f1eac6085..53021807e804c5eb4ebaef53ee673336ccfeb4f7 100644 --- a/sdk/lib/framework/rendering/box.dart +++ b/sdk/lib/framework/rendering/box.dart @@ -216,7 +216,7 @@ abstract class RenderBox extends RenderObject { return constraints.constrainHeight(0.0); } - BoxConstraints get constraints => super.constraints as BoxConstraints; + BoxConstraints get constraints { BoxConstraints result = super.constraints; return result; } void performResize() { // default behaviour for subclasses that have sizedByParent = true size = constraints.constrain(Size.zero);