From c4db2df60fbbf8055d9a3d1ef409b62b82f024f2 Mon Sep 17 00:00:00 2001 From: Ian Fischer Date: Mon, 29 Jun 2015 14:19:30 -0700 Subject: [PATCH] Rename RenderCanvas to PaintingCanvas to avoid confusion with other classes that inherit from RenderObject. R=ianh@google.com, abarth@google.com Review URL: https://codereview.chromium.org/1217933002. --- sdk/example/game/lib/game_demo_world.dart | 2 +- sdk/example/game/lib/node.dart | 12 +- sdk/example/game/lib/node_with_size.dart | 4 +- sdk/example/game/lib/sprite.dart | 2 +- sdk/example/game/lib/sprite_box.dart | 2 +- sdk/example/rendering/sector_layout.dart | 8 +- sdk/example/rendering/touch_demo.dart | 4 +- sdk/lib/rendering/README.md | 5 +- sdk/lib/rendering/block.dart | 2 +- sdk/lib/rendering/box.dart | 30 +- sdk/lib/rendering/flex.dart | 2 +- sdk/lib/rendering/object.dart | 6 +- sdk/lib/rendering/paragraph.dart | 2 +- sdk/lib/rendering/stack.dart | 2 +- sdk/lib/widgets/ink_well.dart | 4 +- sdk/lib/widgets/scaffold.dart | 2 +- sdk/lib/widgets/tabs.dart | 4 +- tests/examples/sector-expected.txt | 556 +++++++++++----------- tests/examples/stocks-expected.txt | 70 +-- tests/examples/styled_text-expected.txt | 64 +-- tests/examples/tabs-expected.txt | 54 +-- tests/raw/box_layout-expected.txt | 8 +- tests/raw/padding_deflate-expected.txt | 6 +- tests/raw/render_box-expected.txt | 4 +- tests/raw/render_flex-expected.txt | 22 +- tests/raw/sector_layout-expected.txt | 18 +- tests/resources/display_list.dart | 10 +- tests/widgets/buttons-expected.txt | 34 +- tests/widgets/dialog-expected.txt | 26 +- tests/widgets/syncs1-expected.txt | 86 ++-- 30 files changed, 526 insertions(+), 525 deletions(-) diff --git a/sdk/example/game/lib/game_demo_world.dart b/sdk/example/game/lib/game_demo_world.dart index c6975f352e0..5f2d32351a5 100644 --- a/sdk/example/game/lib/game_demo_world.dart +++ b/sdk/example/game/lib/game_demo_world.dart @@ -372,7 +372,7 @@ class StarField extends Node { } } - void paint(RenderCanvas canvas) { + void paint(PaintingCanvas canvas) { // Setup paint object for opacity and transfer mode Paint paint = new Paint(); paint.setTransferMode(TransferMode.plus); diff --git a/sdk/example/game/lib/node.dart b/sdk/example/game/lib/node.dart index cfb5eab2a57..51bb6239e01 100644 --- a/sdk/example/game/lib/node.dart +++ b/sdk/example/game/lib/node.dart @@ -395,7 +395,7 @@ class Node { // Rendering - void _visit(RenderCanvas canvas) { + void _visit(PaintingCanvas canvas) { assert(canvas != null); if (!visible) return; @@ -404,7 +404,7 @@ class Node { _postPaint(canvas); } - void _prePaint(RenderCanvas canvas) { + void _prePaint(PaintingCanvas canvas) { canvas.save(); // Get the transformation matrix and apply transform @@ -419,7 +419,7 @@ class Node { /// bounding box's origin, override [NodeWithSize] and call the applyTransformForPivot method before making calls for /// drawing. /// - /// void paint(RenderCanvas canvas) { + /// void paint(PaintingCanvas canvas) { /// canvas.save(); /// applyTransformForPivot(canvas); /// @@ -427,10 +427,10 @@ class Node { /// /// canvas.restore(); /// } - void paint(RenderCanvas canvas) { + void paint(PaintingCanvas canvas) { } - void _visitChildren(RenderCanvas canvas) { + void _visitChildren(PaintingCanvas canvas) { // Sort children if needed _sortChildren(); @@ -455,7 +455,7 @@ class Node { } } - void _postPaint(RenderCanvas canvas) { + void _postPaint(PaintingCanvas canvas) { canvas.restore(); } diff --git a/sdk/example/game/lib/node_with_size.dart b/sdk/example/game/lib/node_with_size.dart index 15503d26922..0e56ded4012 100644 --- a/sdk/example/game/lib/node_with_size.dart +++ b/sdk/example/game/lib/node_with_size.dart @@ -32,7 +32,7 @@ abstract class NodeWithSize extends Node { /// If you use this method you will need to save and restore your canvas at the beginning and /// end of your [paint] method. /// - /// void paint(RenderCanvas canvas) { + /// void paint(PaintingCanvas canvas) { /// canvas.save(); /// applyTransformForPivot(canvas); /// @@ -40,7 +40,7 @@ abstract class NodeWithSize extends Node { /// /// canvas.restore(); /// } - void applyTransformForPivot(RenderCanvas canvas) { + void applyTransformForPivot(PaintingCanvas canvas) { if (pivot.x != 0 || pivot.y != 0) { double pivotInPointsX = size.width * pivot.x; double pivotInPointsY = size.height * pivot.y; diff --git a/sdk/example/game/lib/sprite.dart b/sdk/example/game/lib/sprite.dart index 80990f484c6..bb022262f4d 100644 --- a/sdk/example/game/lib/sprite.dart +++ b/sdk/example/game/lib/sprite.dart @@ -64,7 +64,7 @@ class Sprite extends NodeWithSize { _opacity = opacity; } - void paint(RenderCanvas canvas) { + void paint(PaintingCanvas canvas) { canvas.save(); // Account for pivot point diff --git a/sdk/example/game/lib/sprite_box.dart b/sdk/example/game/lib/sprite_box.dart index d62cbd65126..943d5fcbbb7 100644 --- a/sdk/example/game/lib/sprite_box.dart +++ b/sdk/example/game/lib/sprite_box.dart @@ -251,7 +251,7 @@ class SpriteBox extends RenderBox { _rootNode._invalidateToBoxTransformMatrix(); } - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { canvas.save(); // Move to correct coordinate space before drawing diff --git a/sdk/example/rendering/sector_layout.dart b/sdk/example/rendering/sector_layout.dart index 489b3250355..24f09b3b46f 100644 --- a/sdk/example/rendering/sector_layout.dart +++ b/sdk/example/rendering/sector_layout.dart @@ -127,7 +127,7 @@ abstract class RenderDecoratedSector extends RenderSector { } // offset must point to the center of the circle - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { assert(deltaRadius != null); assert(deltaTheta != null); assert(parentData is SectorParentData); @@ -264,7 +264,7 @@ class RenderSectorRing extends RenderSectorWithChildren { // offset must point to the center of our circle // each sector then knows how to paint itself at its location - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { // TODO(ianh): avoid code duplication super.paint(canvas, offset); RenderSector child = firstChild; @@ -369,7 +369,7 @@ class RenderSectorSlice extends RenderSectorWithChildren { // offset must point to the center of our circle // each sector then knows how to paint itself at its location - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { // TODO(ianh): avoid code duplication super.paint(canvas, offset); RenderSector child = firstChild; @@ -462,7 +462,7 @@ class RenderBoxToRenderSectorAdapter extends RenderBox { } } - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { super.paint(canvas, offset); if (child != null) { Rect bounds = offset & size; diff --git a/sdk/example/rendering/touch_demo.dart b/sdk/example/rendering/touch_demo.dart index bbb8a11ba18..edd6f129f07 100644 --- a/sdk/example/rendering/touch_demo.dart +++ b/sdk/example/rendering/touch_demo.dart @@ -33,7 +33,7 @@ class Dot { radius = 5 + (95 * event.pressure); } - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { canvas.drawCircle(position + offset, radius, _paint); } } @@ -68,7 +68,7 @@ class RenderTouchDemo extends RenderBox { size = constraints.biggest; } - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { Paint white = new Paint() ..color = const Color(0xFFFFFFFF); canvas.drawRect(offset & size, white); diff --git a/sdk/lib/rendering/README.md b/sdk/lib/rendering/README.md index 68acfe65b34..30884cc0c4d 100644 --- a/sdk/lib/rendering/README.md +++ b/sdk/lib/rendering/README.md @@ -44,9 +44,10 @@ render tree: layout without the parent undergoing layout. * Subclasses of `RenderObject` must implement a `paint` function that draws a - visual representation of the object onto a `RenderCanvas`. If + visual representation of the object onto a `PaintingCanvas`. If the `RenderObject` has children, the `RenderObject` is responsible for - painting its children using the `paintChild` function on the `RenderCanvas`. + painting its children using the `paintChild` function on the + `PaintingCanvas`. * Subclasses of `RenderObject` must call `adoptChild` whenever they add a child. Similarly, they must call `dropChild` whenever they remove a child. diff --git a/sdk/lib/rendering/block.dart b/sdk/lib/rendering/block.dart index c93188b4c96..a143acda0c9 100644 --- a/sdk/lib/rendering/block.dart +++ b/sdk/lib/rendering/block.dart @@ -102,7 +102,7 @@ class RenderBlock extends RenderBox with ContainerRenderObjectMixin return true; } - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { if (child != null) canvas.paintChild(child, offset.toPoint()); } @@ -1191,7 +1191,7 @@ class RenderView extends RenderObject with RenderObjectWithChildMixin RenderObject.debugDoingPaint = true; try { sky.PictureRecorder recorder = new sky.PictureRecorder(); - RenderCanvas canvas = new RenderCanvas(recorder, _size); + PaintingCanvas canvas = new PaintingCanvas(recorder, _size); paint(canvas, Offset.zero); sky.view.picture = recorder.endRecording(); } finally { @@ -1255,7 +1255,7 @@ abstract class RenderBoxContainerDefaultsMixin ''; } -class RenderCanvas extends sky.Canvas { - RenderCanvas(sky.PictureRecorder recorder, Size bounds) : super(recorder, bounds); +class PaintingCanvas extends sky.Canvas { + PaintingCanvas(sky.PictureRecorder recorder, Size bounds) : super(recorder, bounds); void paintChild(RenderObject child, Point point) { child.paint(this, point.toOffset()); @@ -243,7 +243,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget { assert(!debugDoingPaint); scheduler.ensureVisualUpdate(); } - void paint(RenderCanvas canvas, Offset offset) { } + void paint(PaintingCanvas canvas, Offset offset) { } // EVENTS diff --git a/sdk/lib/rendering/paragraph.dart b/sdk/lib/rendering/paragraph.dart index f118d0996fe..dcce468cb7b 100644 --- a/sdk/lib/rendering/paragraph.dart +++ b/sdk/lib/rendering/paragraph.dart @@ -172,7 +172,7 @@ class RenderParagraph extends RenderBox { _applyFloatingPointHack(root.height))); } - void paint(RenderCanvas canvas, Offset offset) { + void paint(PaintingCanvas canvas, Offset offset) { // Ideally we could compute the min/max intrinsic width/height with a // non-destructive operation. However, currently, computing these values // will destroy state inside the layout root. If that happens, we need to diff --git a/sdk/lib/rendering/stack.dart b/sdk/lib/rendering/stack.dart index d96311226e4..449b967e3c2 100644 --- a/sdk/lib/rendering/stack.dart +++ b/sdk/lib/rendering/stack.dart @@ -195,7 +195,7 @@ class RenderStack extends RenderBox with ContainerRenderObjectMixin