AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "forward concat44 in nway canvas"

Browse Source 
This reverts commit 8964bc13da.

Reason for revert: break flutter unittest?

Original change's description:
> forward concat44 in nway canvas
> 
> Change-Id: If4eb791c0701fb7055283e721308bd3c633576d7
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263572
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=reed@google.com

Change-Id: I0c8e3b3d0df05948f935ffa6d72ea84ef420b7cc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263714
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2020-01-10 20:26:57 +00:00 committed by Skia Commit-Bot
parent 39de4a444b
commit 3723fb7e85
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils/SkNWayCanvas.h
View File

@ -30,9 +30,7 @@ protected:
bool onDoSaveBehind(const SkRect*) override; bool onDoSaveBehind(const SkRect*) override;
void willRestore() override; void willRestore() override;
void didConcat44(const SkScalar[16]) override;
void didConcat(const SkMatrix&) override; void didConcat(const SkMatrix&) override;
void didTranslate(SkScalar x, SkScalar y) override;
void didSetMatrix(const SkMatrix&) override; void didSetMatrix(const SkMatrix&) override;
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;

6
samplecode/SampleClip.cpp
View File

@ -547,7 +547,7 @@ class HalfPlaneView3 : public SampleCameraView {
} }
void onDrawContent(SkCanvas* canvas) override { void onDrawContent(SkCanvas* canvas) override {
SkMatrix44 mx = this->get44({0, 0, 400, 400}); SkMatrix mx = this->get44({0, 0, 400, 400});
SkPaint paint; SkPaint paint;
paint.setColor({0.75, 0.75, 0.75, 1}); paint.setColor({0.75, 0.75, 0.75, 1});
@ -612,10 +612,12 @@ class HalfPlaneCoons : public SampleCameraView {
} }
void onDrawContent(SkCanvas* canvas) override { void onDrawContent(SkCanvas* canvas) override {
SkMatrix mx = this->get44({0, 0, 300, 300});
SkPaint paint; SkPaint paint;
canvas->save(); canvas->save();
canvas->concat(this->get44({0, 0, 300, 300})); canvas->concat(mx);
const SkPoint* tex = nullptr; const SkPoint* tex = nullptr;
const SkColor* col = nullptr; const SkColor* col = nullptr;

16
src/utils/SkNWayCanvas.cpp
View File

@ -92,14 +92,6 @@ void SkNWayCanvas::willRestore() {
this->INHERITED::willRestore(); this->INHERITED::willRestore();
} }
void SkNWayCanvas::didConcat44(const SkScalar m[16]) {
Iter iter(fList);
while (iter.next()) {
iter->concat44(m);
}
this->INHERITED::didConcat44(m);
}
void SkNWayCanvas::didConcat(const SkMatrix& matrix) { void SkNWayCanvas::didConcat(const SkMatrix& matrix) {
Iter iter(fList); Iter iter(fList);
while (iter.next()) { while (iter.next()) {
@ -108,14 +100,6 @@ void SkNWayCanvas::didConcat(const SkMatrix& matrix) {
this->INHERITED::didConcat(matrix); this->INHERITED::didConcat(matrix);
} }
void SkNWayCanvas::didTranslate(SkScalar x, SkScalar y) {
Iter iter(fList);
while (iter.next()) {
iter->translate(x, y);
}
this->INHERITED::didTranslate(x, y);
}
void SkNWayCanvas::didSetMatrix(const SkMatrix& matrix) { void SkNWayCanvas::didSetMatrix(const SkMatrix& matrix) {
Iter iter(fList); Iter iter(fList);
while (iter.next()) { while (iter.next()) {