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

sky/sdk/lib/rendering/box.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:vector_math/vector_math.dart';
 
 import '../base/debug.dart';
@@ skipping 346 matching lines @@
     }
   }
 
   void hitTestChildren(HitTestResult result, { Point position }) {
     if (child != null)
       child.hitTest(result, position: position);
     else
       super.hitTestChildren(result, position: position);
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null)
       child.paint(canvas);
   }
 
 }
 
 class RenderConstrainedBox extends RenderProxyBox {
   RenderConstrainedBox({
     RenderBox child,
     BoxConstraints additionalConstraints
@@ skipping 100 matching lines @@
   double get opacity => _opacity;
   void set opacity (double value) {
     assert(value != null);
     assert(value >= 0.0 && value <= 1.0);
     if (_opacity == value)
       return;
     _opacity = value;
     markNeedsPaint();
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null) {
       int a = (_opacity * 255).round();
 
       if (a == 0)
         return;
 
       if (a == 255) {
         child.paint(canvas);
         return;
       }
@@ skipping 26 matching lines @@
   sky.TransferMode _transferMode;
   sky.TransferMode get transferMode => _transferMode;
   void set transferMode (sky.TransferMode value) {
     assert(value != null);
     if (_transferMode == value)
       return;
     _transferMode = value;
     markNeedsPaint();
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null) {
       Paint paint = new Paint()
         ..setColorFilter(new sky.ColorFilter.mode(_color, _transferMode));
       canvas.saveLayer(null, paint);
       child.paint(canvas);
       canvas.restore();
     }
   }
 }
 
 class RenderClipRect extends RenderProxyBox {
   RenderClipRect({ RenderBox child }) : super(child);
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null) {
       canvas.save();
       canvas.clipRect(new Rect.fromSize(size));
       child.paint(canvas);
       canvas.restore();
     }
   }
 }
 
 class RenderClipOval extends RenderProxyBox {
   RenderClipOval({ RenderBox child }) : super(child);
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null) {
       Rect rect = new Rect.fromSize(size);
       canvas.saveLayer(rect, new Paint());
       Path path = new Path();
       path.addOval(rect);
       canvas.clipPath(path);
       child.paint(canvas);
       canvas.restore();
     }
   }
 }
 
 abstract class RenderShiftedBox extends RenderBox with RenderObjectWithChildMixin<RenderBox> {
 
   // Abstract class for one-child-layout render boxes
 
   RenderShiftedBox(RenderBox child) {
     this.child = child;
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null)
       canvas.paintChild(child, child.parentData.position);
   }
 
   void hitTestChildren(HitTestResult result, { Point position }) {
     if (child != null) {
       assert(child.parentData is BoxParentData);
       Rect childBounds = new Rect.fromPointAndSize(child.parentData.position, child.size);
       if (childBounds.contains(position)) {
         child.hitTest(result, position: new Point(position.x - child.parentData.position.x,
@@ skipping 215 matching lines @@
   }
 
   double getMaxIntrinsicHeight(BoxConstraints constraints) {
     return _sizeForConstraints(constraints).height;
   }
 
   void performLayout() {
     size = _sizeForConstraints(constraints);
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (_image == null) return;
     bool needsScale = size.width != _image.width || size.height != _image.height;
     if (needsScale) {
       double widthScale = size.width / _image.width;
       double heightScale = size.height / _image.height;
       canvas.save();
       canvas.scale(widthScale, heightScale);
     }
     Paint paint = new Paint();
     canvas.drawImage(_image, 0.0, 0.0, paint);
@@ skipping 14 matching lines @@
   BoxPainter _painter;
   BoxDecoration get decoration => _painter.decoration;
   void set decoration (BoxDecoration value) {
     assert(value != null);
     if (value == _painter.decoration)
       return;
     _painter.decoration = value;
     markNeedsPaint();
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     assert(size.width != null);
     assert(size.height != null);
     _painter.paint(canvas, new Rect.fromSize(size));
     super.paint(canvas);
   }
 
   String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(prefix)}${prefix}decoration:\n${_painter.decoration.toString(prefix + "  ")}\n';
 }
 
 class RenderTransform extends RenderProxyBox {
@@ skipping 49 matching lines @@
     Matrix4 inverse = new Matrix4.zero();
     /* double det = */ inverse.copyInverse(_transform);
     // TODO(abarth): Check the determinant for degeneracy.
 
     Vector3 position3 = new Vector3(position.x, position.y, 0.0);
     Vector3 transformed3 = inverse.transform3(position3);
     Point transformed = new Point(transformed3.x, transformed3.y);
     super.hitTestChildren(result, position: transformed);
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     canvas.save();
     canvas.concat(_transform.storage);
     super.paint(canvas);
     canvas.restore();
   }
 
   String debugDescribeSettings(String prefix) {
     List<String> result = _transform.toString().split('\n').map((s) => '$prefix  $s\n').toList();
     result.removeLast();
     return '${super.debugDescribeSettings(prefix)}${prefix}transform matrix:\n${result.join()}';
@@ skipping 15 matching lines @@
   void performLayout() {
     Size oldSize = size;
 
     super.performLayout();
 
     if (oldSize != size)
       callback(size);
   }
 }
 
-typedef void CustomPaintCallback(sky.Canvas canvas, Size size);
+typedef void CustomPaintCallback(RenderCanvas canvas, Size size);
 
 class RenderCustomPaint extends RenderProxyBox {
 
   RenderCustomPaint({
     CustomPaintCallback callback,
     RenderBox child
   }) : super(child) {
     assert(callback != null);
     _callback = callback;
   }
 
   CustomPaintCallback _callback;
   void set callback (CustomPaintCallback value) {
     assert(value != null || !attached);
     if (_callback == value)
       return;
     _callback = value;
     markNeedsPaint();
   }
 
   void attach() {
     assert(_callback != null);
     super.attach();
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     assert(_callback != null);
     _callback(canvas, size);
     super.paint(canvas);
   }
 }
 
 // RENDER VIEW LAYOUT MANAGER
 
 class ViewConstraints {
 
@@ skipping 61 matching lines @@
   bool hitTest(HitTestResult result, { Point position }) {
     if (child != null) {
       Rect childBounds = new Rect.fromSize(child.size);
       if (childBounds.contains(position))
         child.hitTest(result, position: position);
     }
     result.add(new HitTestEntry(this));
     return true;
   }
 
-  void paint(RenderObjectDisplayList canvas) {
+  void paint(RenderCanvas canvas) {
     if (child != null)
       canvas.paintChild(child, Point.origin);
   }
 
   void paintFrame() {
     sky.tracing.begin('RenderView.paintFrame');
     RenderObject.debugDoingPaint = true;
     try {
-      RenderObjectDisplayList canvas = new RenderObjectDisplayList(sky.view.width, sky.view.height);
+      sky.PictureRecorder recorder = new sky.PictureRecorder();
+      RenderCanvas canvas = new RenderCanvas(recorder, width, height);
       paint(canvas);
-      sky.view.picture = canvas.endRecording();
+      sky.view.picture = recorder.endRecording();
+      RenderObject.debugDoingPaint = false;

[abarth-chromium, 2015/06/23 02:28:45]

This line of code isn't needed.  We assign this value already on line 1083. 
Maybe a bad merge?

[iansf, 2015/06/23 22:46:09]

Correct.  Good catch.

     } finally {
       RenderObject.debugDoingPaint = false;
       sky.tracing.end('RenderView.paintFrame');
     }
   }
 
 }
 
 // DEFAULT BEHAVIORS FOR RENDERBOX CONTAINERS
 abstract class RenderBoxContainerDefaultsMixin<ChildType extends RenderBox, ParentDataType extends ContainerParentDataMixin<ChildType>> implements ContainerRenderObjectMixin<ChildType, ParentDataType> {
 
   void defaultHitTestChildren(HitTestResult result, { Point position }) {
     // the x, y parameters have the top left of the node's box as the origin
     ChildType child = lastChild;
     while (child != null) {
       assert(child.parentData is ParentDataType);
       Rect childBounds = new Rect.fromPointAndSize(child.parentData.position, child.size);
       if (childBounds.contains(position)) {
         if (child.hitTest(result, position: new Point(position.x - child.parentData.position.x,
                                                           position.y - child.parentData.position.y)))
           break;
       }
       child = child.parentData.previousSibling;
     }
   }
 
-  void defaultPaint(RenderObjectDisplayList canvas) {
+  void defaultPaint(RenderCanvas canvas) {
     RenderBox child = firstChild;
     while (child != null) {
       assert(child.parentData is ParentDataType);
       canvas.paintChild(child, child.parentData.position);
       child = child.parentData.nextSibling;
     }
   }
 }