Skip to content

Commit 997c753

Browse files
committed
fix(canvas): remove __painter from Layer and inject painter in Painter#insertLayer when it doesn't exist
1 parent 9263428 commit 997c753

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/canvas/Layer.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ export default class Layer extends Eventful {
8989

9090
private _paintRects: BoundingRect[]
9191

92-
__painter: CanvasPainter
93-
9492
__dirty = true
9593
__firstTimePaint = true
9694

@@ -449,9 +447,8 @@ export default class Layer extends Eventful {
449447
clearColorGradientOrPattern = createCanvasPattern(
450448
ctx, clearColor, {
451449
dirty() {
452-
// TODO
453450
self.setUnpainted();
454-
self.__painter.refresh();
451+
self.painter.refresh();
455452
}
456453
}
457454
);

src/canvas/Painter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ export default class CanvasPainter implements PainterBase {
597597

598598
layersMap[zlevel] = layer;
599599

600-
// Vitual layer will not directly show on the screen.
600+
// Virtual layer will not directly show on the screen.
601601
// (It can be a WebGL layer and assigned to a ZRImage element)
602602
// But it still under management of zrender.
603603
if (!layer.virtual) {
@@ -623,7 +623,7 @@ export default class CanvasPainter implements PainterBase {
623623
}
624624
}
625625

626-
layer.__painter = this;
626+
layer.painter || (layer.painter = this);
627627
}
628628

629629
// Iterate each layer

0 commit comments

Comments
 (0)