Skip to content

Commit 022bb11

Browse files
Remove dead code for 3x3 matrices (flutter#23363)
Co-authored-by: Mike Reed <[email protected]>
1 parent a5f4b4b commit 022bb11

File tree

4 files changed

+0
-22
lines changed

4 files changed

+0
-22
lines changed

shell/common/canvas_spy.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ bool DidDrawCanvas::onDoSaveBehind(const SkRect* bounds) {
5151

5252
void DidDrawCanvas::willRestore() {}
5353

54-
#ifdef SK_SUPPORT_LEGACY_CANVASMATRIX33
55-
void DidDrawCanvas::didConcat(const SkMatrix& matrix) {}
56-
void DidDrawCanvas::didSetMatrix(const SkMatrix& matrix) {}
57-
#endif
58-
5954
void DidDrawCanvas::didConcat44(const SkM44&) {}
6055

6156
void DidDrawCanvas::didScale(SkScalar, SkScalar) {}

shell/common/canvas_spy.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
7070
void willRestore() override;
7171

7272
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
73-
#ifdef SK_SUPPORT_LEGACY_CANVASMATRIX33
74-
void didConcat(const SkMatrix&) override;
75-
void didSetMatrix(const SkMatrix&) override;
76-
#endif
7773
void didConcat44(const SkM44&) override;
7874
void didScale(SkScalar, SkScalar) override;
7975
void didTranslate(SkScalar, SkScalar) override;

testing/mock_canvas.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ void MockCanvas::willRestore() {
5656
current_layer_--; // Must go here; func params order of eval is undefined
5757
}
5858

59-
#ifdef SK_SUPPORT_LEGACY_CANVASMATRIX33
60-
void MockCanvas::didConcat(const SkMatrix& matrix) {
61-
this->didConcat44(SkM44(matrix));
62-
}
63-
void MockCanvas::didSetMatrix(const SkMatrix& matrix) {
64-
this->didSetM44(SkM44(matrix));
65-
}
66-
#endif
67-
6859
void MockCanvas::didConcat44(const SkM44& matrix) {
6960
draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrixData{matrix}});
7061
}

testing/mock_canvas.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
144144
SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override;
145145
void willRestore() override;
146146
void didRestore() override {}
147-
#ifdef SK_SUPPORT_LEGACY_CANVASMATRIX33
148-
void didConcat(const SkMatrix& matrix) override;
149-
void didSetMatrix(const SkMatrix& matrix) override;
150-
#endif
151147
void didConcat44(const SkM44&) override;
152148
void didSetM44(const SkM44&) override;
153149
void didScale(SkScalar x, SkScalar y) override;

0 commit comments

Comments
 (0)