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

sky/tests/resources/display_list.dart

 
 import 'dart:sky' as sky;
+import 'dart:typed_data';
 
 import 'package:sky/framework/rendering/box.dart';
 import 'package:sky/framework/rendering/object.dart';
 
 typedef void Logger (String s);
 
-class TestDisplayList extends RenderObjectDisplayList {
-  TestDisplayList(double width, double height, this.logger, { this.indent: '' }) :
-    this.width = width,
-    this.height = height,
-    super(width, height) {
-    log("TestDisplayList() constructor: $width x $height");
+class TestPictureRecorder extends sky.PictureRecorder {
+  TestPictureRecorder(this.logger, { this.indent: '' }) {
+    log("TestPictureRecorder() constructor");
+  }
+  final String indent;
+  Logger logger;
+
+  void log(String s) {
+    logger("${indent} ${s}");
+  }
+
+  sky.Canvas beginRecording(double width, double height) {
+    log("beginRecording($width, $height)");
+
+    var canvas = super.beginRecording(width, height);
+
+    return new TestCanvas(canvas, width, height, this.logger, indent: this.indent);
+  }
+}
+
+class TestCanvas implements sky.Canvas {
+  TestCanvas(this.canvas, this.width, this.height, this.logger, { this.indent: '' }) {
+    log("TestCanvas() constructor: $width x $height");
   }
 
   final String indent;
   final double width;
   final double height;
+  sky.Canvas canvas;

[abarth-chromium, 2015/06/18 00:03:52]

I don't think you need to pass |canvas| to this object.  You don't seem to use
it for anything.

[iansf, 2015/06/20 00:02:40]

Done.  (This file is still in flux, though, so don't worry about it too much.)

 
   Logger logger;
   void log(String s) {
     logger("${indent} ${s}");
   }
 
   String explainPaint(Paint paint) {
     assert(paint.toString() == "Instance of 'Paint'"); // if this assertion fails, remove all calls to explainPaint with just inlining $paint
     return "Paint(${paint.color})";
   }
@@ skipping 19 matching lines @@
   }
 
   void rotate(double radians) {
     log("rotate($radians)");
   }
 
   void skew(double sx, double sy) {
     log("skew($sx, $sy)");
   }
 
-  void concat(List<double> matrix9) {
-    log("concat($matrix9)");
+  void concat(Float32List matrix4) {
+    log("concat($matrix4)");
   }
 
   void clipRect(Rect rect) {
     log("clipRect($rect)");
   }
 
   void clipRRect(sky.RRect rrect) {
     log("clipRRect()");
   }
 
@@ skipping 29 matching lines @@
     log("drawCircle($x, $y, $radius, ${explainPaint(paint)})");
   }
 
   void drawPath(Path path, Paint paint) {
     log("drawPath($path, ${explainPaint(paint)})");
   }
 
   void drawImage(sky.Image image, double x, double y, Paint paint) {
     log("drawImage($image, $x, $y, ${explainPaint(paint)})");
   }
-
-  void paintChild(RenderObject child, Point position) {
-    log("paintChild ${child.runtimeType} at $position");
-    child.paint(new TestDisplayList(width, height, logger, indent: "$indent  |"));
-  }
 }
 
 class TestRenderView extends RenderView {
 
   TestRenderView([ RenderBox child = null ]) : super(child: child) {
     print("TestRenderView enabled");
     attach();
     rootConstraints = new ViewConstraints(width: 800.0, height: 600.0); // arbitrary figures
     scheduleInitialLayout();
     checkFrame();
   }
 
   int frame = 0;
 
   String lastPaint = '';
   void log(String s) {
     lastPaint += "\n$s";
   }
 
   void paintFrame() {
     RenderObject.debugDoingPaint = true;
     frame += 1;
     lastPaint = '';
     log("PAINT FOR FRAME #${frame} ----------------------------------------------");
-    var canvas = new TestDisplayList(rootConstraints.width, rootConstraints.height, log, indent: "${frame} |");
+    var recorder = new TestPictureRecorder(log, indent: "${frame} |");
+    var canvas = recorder.beginRecording(rootConstraints.width, rootConstraints.height);
     paint(canvas);
+    recorder.endRecording();
     log("------------------------------------------------------------------------");
     RenderObject.debugDoingPaint = false;
   }
 
   void checkFrame() {
     RenderObject.flushLayout();
     paintFrame();
     print(lastPaint); // TODO(ianh): figure out how to make this fit the unit testing framework better
   }
 
 }