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

Guard canvas virtuals so we can remove legacy didConcat44 #17756

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Guard canvas virtuals so we can remove legacy didConcat44 #17756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be9a5f9
Guard canvas virtuals so we can remove legacy didConcat44
brianosman Apr 16, 2020
e94bc02
Fix formatting
brianosman Apr 16, 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
4 changes: 4 additions & 0 deletions shell/common/canvas_spy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ 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) {}

Expand Down
4 changes: 4 additions & 0 deletions shell/common/canvas_spy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ 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;

Expand Down
18 changes: 9 additions & 9 deletions testing/assertions_skia.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ std::ostream& operator<<(std::ostream& os, const SkMatrix& m) {
return os;
}

std::ostream& operator<<(std::ostream& os, const SkMatrix44& m) {
os << m.get(0, 0) << ", " << m.get(0, 1) << ", " << m.get(0, 2) << ", "
<< m.get(0, 3) << std::endl;
os << m.get(1, 0) << ", " << m.get(1, 1) << ", " << m.get(1, 2) << ", "
<< m.get(1, 3) << std::endl;
os << m.get(2, 0) << ", " << m.get(2, 1) << ", " << m.get(2, 2) << ", "
<< m.get(2, 3) << std::endl;
os << m.get(3, 0) << ", " << m.get(3, 1) << ", " << m.get(3, 2) << ", "
<< m.get(3, 3);
std::ostream& operator<<(std::ostream& os, const SkM44& m) {
os << m.rc(0, 0) << ", " << m.rc(0, 1) << ", " << m.rc(0, 2) << ", "
<< m.rc(0, 3) << std::endl;
os << m.rc(1, 0) << ", " << m.rc(1, 1) << ", " << m.rc(1, 2) << ", "
<< m.rc(1, 3) << std::endl;
os << m.rc(2, 0) << ", " << m.rc(2, 1) << ", " << m.rc(2, 2) << ", "
<< m.rc(2, 3) << std::endl;
os << m.rc(3, 0) << ", " << m.rc(3, 1) << ", " << m.rc(3, 2) << ", "
<< m.rc(3, 3);
return os;
}

Expand Down
3 changes: 2 additions & 1 deletion testing/assertions_skia.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <ostream>

#include "third_party/skia/include/core/SkClipOp.h"
#include "third_party/skia/include/core/SkM44.h"
#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/skia/include/core/SkMatrix44.h"
#include "third_party/skia/include/core/SkPaint.h"
Expand All @@ -20,7 +21,7 @@ namespace testing {

extern std::ostream& operator<<(std::ostream& os, const SkClipOp& o);
extern std::ostream& operator<<(std::ostream& os, const SkMatrix& m);
extern std::ostream& operator<<(std::ostream& os, const SkMatrix44& m);
extern std::ostream& operator<<(std::ostream& os, const SkM44& m);
extern std::ostream& operator<<(std::ostream& os, const SkVector3& v);
extern std::ostream& operator<<(std::ostream& os, const SkVector4& v);
extern std::ostream& operator<<(std::ostream& os, const SkRect& r);
Expand Down
10 changes: 8 additions & 2 deletions testing/mock_canvas.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,17 @@ 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[]) {
SkMatrix44 m44;
m44.setColMajor(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;
Expand Down
8 changes: 6 additions & 2 deletions testing/mock_canvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "third_party/skia/include/core/SkClipOp.h"
#include "third_party/skia/include/core/SkData.h"
#include "third_party/skia/include/core/SkImageFilter.h"
#include "third_party/skia/include/core/SkMatrix44.h"
#include "third_party/skia/include/core/SkM44.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkRRect.h"
#include "third_party/skia/include/core/SkRect.h"
Expand Down Expand Up @@ -57,7 +57,7 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
};

struct ConcatMatrix44Data {
SkMatrix44 matrix;
SkM44 matrix;
};

struct SetMatrixData {
Expand Down Expand Up @@ -145,7 +145,11 @@ 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;
Expand Down