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

sky/tests/resources/display_list.dart

 
 import 'dart:async';
 import 'dart:sky' as sky;
 import "dart:sky.internals" as internals;
+import 'dart:typed_data';
 
 import 'package:sky/widgets/basic.dart';
 import 'package:sky/rendering/box.dart';
 import 'package:sky/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(width, height, this.logger, indent: this.indent);

[abarth-chromium, 2015/06/20 00:50:29]

This function then becomes:

return new TestCanvas(this, width, height, this.logger, indent: this.indent);

+  }
+}
+
+class TestCanvas extends sky.Canvas {
+  TestCanvas(this.width, this.height, this.logger, { this.indent: '' }) {

[abarth-chromium, 2015/06/20 00:50:29]

I'd call |super| here.

+    log("TestCanvas() constructor: $width x $height");
   }
 
   final String indent;
   final double width;
   final double height;
 
   Logger logger;
   void log(String s) {
     logger("${indent} ${s}");
   }
@@ 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 32 matching lines @@
   void drawPath(Path path, Paint paint) {
     log("drawPath($path, $paint)");
   }
 
   void drawImage(sky.Image image, double x, double y, Paint paint) {
     log("drawImage($image, $x, $y, $paint)");
   }
 
   void paintChild(RenderObject child, Point position) {
     log("paintChild ${child.runtimeType} at $position");
-    child.paint(new TestDisplayList(width, height, logger, indent: "$indent  |"));
+    child.paint(new TestCanvas(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();
     syncCheckFrame();
   }
 
   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;
   }
 
   // TEST API:
 
   void syncCheckFrame() {
     RenderObject.flushLayout();
     paintFrame();
     print(lastPaint); // TODO(ianh): figure out how to make this fit the unit testing framework better
@@ skipping 24 matching lines @@
 
   Future test(Function builder) {
     runApp(new TestApp(builder: builder), renderViewOverride: renderView);
     return renderView.checkFrame();
   }
 
   void endTest() {
     renderView.endTest();
   }
 }