Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 3723fb7

Browse files
reed-at-googleSkia Commit-Bot
authored andcommitted
Revert "forward concat44 in nway canvas"
This reverts commit 8964bc1. Reason for revert: break flutter unittest? Original change's description: > forward concat44 in nway canvas > > Change-Id: If4eb791c0701fb7055283e721308bd3c633576d7 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263572 > Reviewed-by: Mike Reed <[email protected]> > Commit-Queue: Mike Reed <[email protected]> [email protected] Change-Id: I0c8e3b3d0df05948f935ffa6d72ea84ef420b7cc No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263714 Reviewed-by: Mike Reed <[email protected]> Commit-Queue: Mike Reed <[email protected]>
1 parent 39de4a4 commit 3723fb7

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

include/utils/SkNWayCanvas.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class SK_API SkNWayCanvas : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
3030
bool onDoSaveBehind(const SkRect*) override;
3131
void willRestore() override;
3232

33-
void didConcat44(const SkScalar[16]) override;
3433
void didConcat(const SkMatrix&) override;
35-
void didTranslate(SkScalar x, SkScalar y) override;
3634
void didSetMatrix(const SkMatrix&) override;
3735

3836
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;

samplecode/SampleClip.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ class HalfPlaneView3 : public SampleCameraView {
547547
}
548548

549549
void onDrawContent(SkCanvas* canvas) override {
550-
SkMatrix44 mx = this->get44({0, 0, 400, 400});
550+
SkMatrix mx = this->get44({0, 0, 400, 400});
551551

552552
SkPaint paint;
553553
paint.setColor({0.75, 0.75, 0.75, 1});
@@ -612,10 +612,12 @@ class HalfPlaneCoons : public SampleCameraView {
612612
}
613613

614614
void onDrawContent(SkCanvas* canvas) override {
615+
SkMatrix mx = this->get44({0, 0, 300, 300});
616+
615617
SkPaint paint;
616618

617619
canvas->save();
618-
canvas->concat(this->get44({0, 0, 300, 300}));
620+
canvas->concat(mx);
619621

620622
const SkPoint* tex = nullptr;
621623
const SkColor* col = nullptr;

src/utils/SkNWayCanvas.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,6 @@ void SkNWayCanvas::willRestore() {
9292
this->INHERITED::willRestore();
9393
}
9494

95-
void SkNWayCanvas::didConcat44(const SkScalar m[16]) {
96-
Iter iter(fList);
97-
while (iter.next()) {
98-
iter->concat44(m);
99-
}
100-
this->INHERITED::didConcat44(m);
101-
}
102-
10395
void SkNWayCanvas::didConcat(const SkMatrix& matrix) {
10496
Iter iter(fList);
10597
while (iter.next()) {
@@ -108,14 +100,6 @@ void SkNWayCanvas::didConcat(const SkMatrix& matrix) {
108100
this->INHERITED::didConcat(matrix);
109101
}
110102

111-
void SkNWayCanvas::didTranslate(SkScalar x, SkScalar y) {
112-
Iter iter(fList);
113-
while (iter.next()) {
114-
iter->translate(x, y);
115-
}
116-
this->INHERITED::didTranslate(x, y);
117-
}
118-
119103
void SkNWayCanvas::didSetMatrix(const SkMatrix& matrix) {
120104
Iter iter(fList);
121105
while (iter.next()) {

0 commit comments

Comments
 (0)