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

Canvas: Remove some unused virtuals, and prepare for signature change (flutter/engine#17135)

Browse Source 
* Canvas: Remove some unused virtuals, and prepare for signature change

* Better vertices fix

* Add empty placeholders for old signature
This commit is contained in:
Brian Osman 2020-03-13 15:25:01 -04:00 committed by GitHub
parent 27f4a8ecbc
commit ac523daa3d
4 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,20 +139,6 @@ void DidDrawCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
did_draw_ = true;
}
void DidDrawCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
const SkIRect& center,
const SkRect& dst,
const SkPaint* paint) {
did_draw_ = true;
}
void DidDrawCanvas::onDrawBitmapLattice(const SkBitmap& bitmap,
const Lattice& lattice,
const SkRect& dst,
const SkPaint* paint) {
did_draw_ = true;
}
void DidDrawCanvas::onDrawImage(const SkImage* image,
SkScalar left,
SkScalar top,
@ -201,8 +187,6 @@ void DidDrawCanvas::onDrawDrawable(SkDrawable* drawable,
}
void DidDrawCanvas::onDrawVerticesObject(const SkVertices* vertices,
const SkVertices::Bone bones[],
int boneCount,
SkBlendMode bmode,
const SkPaint& paint) {
MarkDrawIfNonTransparentPaint(paint);

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

@ -153,12 +153,6 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
const SkPaint*,
SrcRectConstraint) override;
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
void onDrawBitmapLattice(const SkBitmap&,
const Lattice&,
const SkRect&,
const SkPaint*) override;
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
void onDrawImageLattice(const SkImage*,
const Lattice&,
@ -172,15 +166,14 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
const SkPaint*) override;
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
void onDrawBitmapNine(const SkBitmap&,
const SkIRect& center,
const SkRect& dst,
const SkPaint*) override;
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
#ifdef SK_SUPPORT_LEGACY_DRAWVERTS_VIRTUAL
void onDrawVerticesObject(const SkVertices*,
const SkVertices::Bone[],
int,
SkBlendMode,
const SkPaint&) override {}
#endif
void onDrawVerticesObject(const SkVertices*,
const SkVertices::Bone bones[],
int boneCount,
SkBlendMode,
const SkPaint&) override;

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

@ -262,13 +262,6 @@ void MockCanvas::onDrawImageNine(const SkImage*,
FML_DCHECK(false);
}
void MockCanvas::onDrawBitmapNine(const SkBitmap&,
const SkIRect&,
const SkRect&,
const SkPaint*) {
FML_DCHECK(false);
}
void MockCanvas::onDrawImageLattice(const SkImage*,
const Lattice&,
const SkRect&,
@ -276,16 +269,7 @@ void MockCanvas::onDrawImageLattice(const SkImage*,
FML_DCHECK(false);
}
void MockCanvas::onDrawBitmapLattice(const SkBitmap&,
const Lattice&,
const SkRect&,
const SkPaint*) {
FML_DCHECK(false);
}
void MockCanvas::onDrawVerticesObject(const SkVertices*,
const SkVertices::Bone[],
int,
SkBlendMode,
const SkPaint&) {
FML_DCHECK(false);

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

@ -217,21 +217,18 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
SkScalar x,
SkScalar y,
const SkPaint* paint) override;
void onDrawBitmapNine(const SkBitmap&,
const SkIRect&,
const SkRect&,
const SkPaint*) override;
void onDrawImageLattice(const SkImage*,
const Lattice&,
const SkRect&,
const SkPaint*) override;
void onDrawBitmapLattice(const SkBitmap&,
const Lattice&,
const SkRect&,
const SkPaint*) override;
#ifdef SK_SUPPORT_LEGACY_DRAWVERTS_VIRTUAL
void onDrawVerticesObject(const SkVertices*,
const SkVertices::Bone[],
int,
SkBlendMode,
const SkPaint&) override {}
#endif
void onDrawVerticesObject(const SkVertices*,
SkBlendMode,
const SkPaint&) override;
void onDrawAtlas(const SkImage*,