Decouple Canvas from DisplayList and map Picture and PictureRecorder more directly to their Skia co…

sky/examples/rendering/sector_layout.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 '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/object.dart';
 
@@ skipping 95 matching lines @@
   BoxDecoration _decoration;
   BoxDecoration get decoration => _decoration;
   void set decoration (BoxDecoration value) {
     if (value == _decoration)
       return;
     _decoration = value;
     markNeedsPaint();
   }
 
   // origin must be set to the center of the circle
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(sky.Canvas canvas) {
     assert(deltaRadius != null);
     assert(deltaTheta != null);
     assert(parentData is SectorParentData);
 
     if (_decoration == null)
       return;
 
     if (_decoration.backgroundColor != null) {
       Paint paint = new Paint()..color = _decoration.backgroundColor;
       Path path = new Path();
@@ skipping 115 matching lines @@
       if (child != null) {
         innerTheta += paddingTheta;
         remainingDeltaTheta -= paddingTheta;
       }
     }
     deltaTheta = innerTheta;
   }
 
   // paint origin is 0,0 of our circle
   // each sector then knows how to paint itself at its location
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(sky.Canvas canvas) {
     // TODO(ianh): avoid code duplication
     super.paint(canvas);
     RenderSector child = firstChild;
     while (child != null) {
       assert(child.parentData is SectorChildListParentData);
-      canvas.paintChild(child, Point.origin);
+      paintChild(canvas, child, Point.origin);
       child = child.parentData.nextSibling;
     }
   }
 
 }
 
 class RenderSectorSlice extends RenderSectorWithChildren {
   // lays out RenderSector children in a stack
 
   RenderSectorSlice({
@@ skipping 78 matching lines @@
       assert(child.parentData is SectorChildListParentData);
       child = child.parentData.nextSibling;
       childRadius += padding;
       remainingDeltaRadius -= padding;
     }
     deltaRadius = childRadius - this.parentData.radius;
   }
 
   // paint origin is 0,0 of our circle
   // each sector then knows how to paint itself at its location
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(sky.Canvas canvas) {
     // TODO(ianh): avoid code duplication
     super.paint(canvas);
     RenderSector child = firstChild;
     while (child != null) {
       assert(child.parentData is SectorChildListParentData);
-      canvas.paintChild(child, Point.origin);
+      paintChild(canvas, child, Point.origin);
       child = child.parentData.nextSibling;
     }
   }
 
 }
 
 class RenderBoxToRenderSectorAdapter extends RenderBox {
 
   RenderBoxToRenderSectorAdapter({ double innerRadius: 0.0, RenderSector child }) :
     _innerRadius = innerRadius {
@@ skipping 47 matching lines @@
       assert(child.parentData is SectorParentData);
       child.parentData.radius = innerRadius;
       child.parentData.theta = 0.0;
       child.layout(new SectorConstraints(maxDeltaRadius: maxChildDeltaRadius), parentUsesSize: true);
       double dimension = (innerRadius + child.deltaRadius) * 2.0;
       size = constraints.constrain(new Size(dimension, dimension));
     }
   }
 
   // paint origin is 0,0 of our circle
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(sky.Canvas canvas) {
     super.paint(canvas);
     if (child != null) {
       Rect bounds = new Rect.fromSize(size);
-      canvas.paintChild(child, bounds.center);
+      paintChild(canvas, child, bounds.center);
     }
   }
 
   bool hitTest(HitTestResult result, { Point position }) {
     double x = position.x;
     double y = position.y;
     if (child == null)
       return false;
     // translate to our origin
     x -= size.width/2.0;
@@ skipping 51 matching lines @@
   rootCircle.add(new RenderSolidColor(const Color(0xFF0000FF), desiredDeltaTheta: kTwoPi * 0.4));
   var stack = new RenderSectorSlice(padding: 2.0);
   stack.add(new RenderSolidColor(const Color(0xFFFFFF00), desiredDeltaRadius: 20.0));
   stack.add(new RenderSolidColor(const Color(0xFFFF9000), desiredDeltaRadius: 20.0));
   stack.add(new RenderSolidColor(const Color(0xFF00FF00)));
   rootCircle.add(stack);
 
   var root = new RenderBoxToRenderSectorAdapter(innerRadius: 50.0, child: rootCircle);
   app = new AppView(root);
 }