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

Canvas: Remove some unused virtuals, and prepare for signature change #17135

Merged
brianosman merged 3 commits into from
Mar 13, 2020
Merged

Canvas: Remove some unused virtuals, and prepare for signature change #17135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ae18e4
Canvas: Remove some unused virtuals, and prepare for signature change
brianosman Mar 13, 2020
4f52988
Better vertices fix
brianosman Mar 13, 2020
065737c
Add empty placeholders for old signature
brianosman Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions shell/common/canvas_spy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
21 changes: 7 additions & 14 deletions shell/common/canvas_spy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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&,
Expand All @@ -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;

Expand Down
16 changes: 0 additions & 16 deletions testing/mock_canvas.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,30 +262,14 @@ 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&,
const SkPaint*) {
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);
Expand Down
13 changes: 5 additions & 8 deletions testing/mock_canvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*,
Expand Down