Commit 8f894f37 authored by Ian Hickson's avatar Ian Hickson

Merge pull request #1140 from Hixie/concat

Transition callers from 'concat' to 'transform'
parents fafec810 17ef9488
......@@ -39,7 +39,7 @@ ui.Picture paint(ui.Rect paintBounds) {
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0,
]);
canvas.concat(scaleMatrix);
canvas.transform(scaleMatrix);
paint.color = const ui.Color.fromARGB(128, 0, 255, 0);
canvas.drawCircle(ui.Point.origin, radius, paint);
......
......@@ -379,7 +379,7 @@ class _InkSplash extends InkFeature implements InkSplash {
Offset originOffset = MatrixUtils.getAsTranslation(transform);
if (originOffset == null) {
canvas.save();
canvas.concat(transform.storage);
canvas.transform(transform.storage);
if (clipToReferenceBox)
canvas.clipRect(Point.origin & referenceBox.size);
if (repositionToReferenceBox)
......@@ -465,7 +465,7 @@ class _InkHighlight extends InkFeature implements InkHighlight {
Offset originOffset = MatrixUtils.getAsTranslation(transform);
if (originOffset == null) {
canvas.save();
canvas.concat(transform.storage);
canvas.transform(transform.storage);
_paintHighlight(canvas, Point.origin & referenceBox.size, paint);
canvas.restore();
} else {
......
......@@ -279,7 +279,7 @@ class PaintingContext {
Matrix4 offsetMatrix = new Matrix4.translationValues(offset.dx, offset.dy, 0.0);
Matrix4 transformWithOffset = offsetMatrix * transform;
canvas.save();
canvas.concat(transformWithOffset.storage);
canvas.transform(transformWithOffset.storage);
painter(this, Offset.zero);
canvas.restore();
}
......
......@@ -337,7 +337,7 @@ class SpriteBox extends RenderBox {
// Move to correct coordinate space before drawing
canvas.translate(offset.dx, offset.dy);
canvas.concat(transformMatrix.storage);
canvas.transform(transformMatrix.storage);
// Draw the sprite tree
Matrix4 totalMatrix = new Matrix4.fromFloat64List(canvas.getTotalMatrix());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment