Index: sky/examples/raw/sector_layout.dart |
diff --git a/sky/examples/raw/sector_layout.dart b/sky/examples/raw/sector_layout.dart |
index f43ee5a1eeb06e8fed244fc21d8f0c954ba3df9d..7b5d6dd391a216a0b4a040a8a5b45bf0cfa22eb5 100644 |
--- a/sky/examples/raw/sector_layout.dart |
+++ b/sky/examples/raw/sector_layout.dart |
@@ -6,7 +6,7 @@ import 'dart:math' as math; |
import 'dart:sky' as sky; |
import 'package:sky/framework/app.dart'; |
import 'package:sky/framework/rendering/box.dart'; |
-import 'package:sky/framework/rendering/node.dart'; |
+import 'package:sky/framework/rendering/object.dart'; |
const double kTwoPi = 2 * math.PI; |
@@ -62,9 +62,9 @@ class SectorParentData extends ParentData { |
double theta = 0.0; |
} |
-abstract class RenderSector extends RenderNode { |
+abstract class RenderSector extends RenderObject { |
- void setParentData(RenderNode child) { |
+ void setParentData(RenderObject child) { |
if (child.parentData is! SectorParentData) |
child.parentData = new SectorParentData(); |
} |
@@ -115,7 +115,7 @@ class RenderDecoratedSector extends RenderSector { |
} |
// origin must be set to the center of the circle |
- void paint(RenderNodeDisplayList canvas) { |
+ void paint(RenderObjectDisplayList canvas) { |
assert(deltaRadius != null); |
assert(deltaTheta != null); |
assert(parentData is SectorParentData); |
@@ -140,7 +140,7 @@ class RenderDecoratedSector extends RenderSector { |
class SectorChildListParentData extends SectorParentData with ContainerParentDataMixin<RenderSector> { } |
-class RenderSectorWithChildren extends RenderDecoratedSector with ContainerRenderNodeMixin<RenderSector, SectorChildListParentData> { |
+class RenderSectorWithChildren extends RenderDecoratedSector with ContainerRenderObjectMixin<RenderSector, SectorChildListParentData> { |
RenderSectorWithChildren(BoxDecoration decoration) : super(decoration); |
void hitTestChildren(HitTestResult result, { double radius, double theta }) { |
@@ -184,7 +184,7 @@ class RenderSectorRing extends RenderSectorWithChildren { |
} |
} |
- void setParentData(RenderNode child) { |
+ void setParentData(RenderObject child) { |
// TODO(ianh): avoid code duplication |
if (child.parentData is! SectorChildListParentData) |
child.parentData = new SectorChildListParentData(); |
@@ -251,7 +251,7 @@ class RenderSectorRing extends RenderSectorWithChildren { |
// paint origin is 0,0 of our circle |
// each sector then knows how to paint itself at its location |
- void paint(RenderNodeDisplayList canvas) { |
+ void paint(RenderObjectDisplayList canvas) { |
// TODO(ianh): avoid code duplication |
super.paint(canvas); |
RenderSector child = firstChild; |
@@ -294,7 +294,7 @@ class RenderSectorSlice extends RenderSectorWithChildren { |
} |
} |
- void setParentData(RenderNode child) { |
+ void setParentData(RenderObject child) { |
// TODO(ianh): avoid code duplication |
if (child.parentData is! SectorChildListParentData) |
child.parentData = new SectorChildListParentData(); |
@@ -356,7 +356,7 @@ class RenderSectorSlice extends RenderSectorWithChildren { |
// paint origin is 0,0 of our circle |
// each sector then knows how to paint itself at its location |
- void paint(RenderNodeDisplayList canvas) { |
+ void paint(RenderObjectDisplayList canvas) { |
// TODO(ianh): avoid code duplication |
super.paint(canvas); |
RenderSector child = firstChild; |
@@ -394,7 +394,7 @@ class RenderBoxToRenderSectorAdapter extends RenderBox { |
markNeedsLayout(); |
} |
- void setParentData(RenderNode child) { |
+ void setParentData(RenderObject child) { |
if (child.parentData is! SectorParentData) |
child.parentData = new SectorParentData(); |
} |
@@ -430,7 +430,7 @@ class RenderBoxToRenderSectorAdapter extends RenderBox { |
} |
// paint origin is 0,0 of our circle |
- void paint(RenderNodeDisplayList canvas) { |
+ void paint(RenderObjectDisplayList canvas) { |
super.paint(canvas); |
if (child != null) { |
sky.Rect bounds = new sky.Rect.fromSize(size); |