DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy version of SkCanvas::didConcat44 (flutter/engine#17828)

Browse Source 
Builds flags have been switched, so the old versions aren't needed any
longer.
This commit is contained in:
Brian Osman 2020-04-21 08:46:57 -04:00 committed by GitHub
parent 70160565bf
commit 1a6e99b23d
4 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/shell/common/canvas_spy.cc
View File

@ -53,11 +53,7 @@ void DidDrawCanvas::willRestore() {}
void DidDrawCanvas::didConcat(const SkMatrix& matrix) {}
#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
void DidDrawCanvas::didConcat44(const SkScalar[]) {}
#else
void DidDrawCanvas::didConcat44(const SkM44&) {}
#endif
void DidDrawCanvas::didScale(SkScalar, SkScalar) {}

4
engine/src/flutter/shell/common/canvas_spy.h
View File

@ -71,11 +71,7 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
void didConcat(const SkMatrix&) override;
#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
void didConcat44(const SkScalar[]) override;
#else
void didConcat44(const SkM44&) override;
#endif
void didScale(SkScalar, SkScalar) override;
void didTranslate(SkScalar, SkScalar) override;

7
engine/src/flutter/testing/mock_canvas.cc
View File

@ -60,17 +60,10 @@ void MockCanvas::didConcat(const SkMatrix& matrix) {
draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrixData{matrix}});
}
#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
void MockCanvas::didConcat44(const SkScalar matrix[]) {
SkM44 m44 = SkM44::ColMajor(matrix);
draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrix44Data{m44}});
}
#else
void MockCanvas::didConcat44(const SkM44& matrix) {
draw_calls_.emplace_back(
DrawCall{current_layer_, ConcatMatrix44Data{matrix}});
}
#endif
void MockCanvas::didScale(SkScalar x, SkScalar y) {
SkMatrix m;

4
engine/src/flutter/testing/mock_canvas.h
View File

@ -145,11 +145,7 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
void willRestore() override;
void didRestore() override {}
void didConcat(const SkMatrix& matrix) override;
#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
void didConcat44(const SkScalar matrix[]) override;
#else
void didConcat44(const SkM44&) override;
#endif
void didScale(SkScalar x, SkScalar y) override;
void didTranslate(SkScalar x, SkScalar y) override;
void didSetMatrix(const SkMatrix& matrix) override;