commit f6d70a8e3fc2ee983e82723490e44f0362afb136
author Mike Reed <reed@google.com> Fri Jan 10 15:56:32 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 10 22:01:41 2020 +0000
tree 87be270d73b3b568ce3b3966d31bbbb61229c4ab
parent 3723fb7e85bb5faacb93dc0d5416699b2ed31eb0

Revert "Revert "forward concat44 in nway canvas""

This reverts commit 3723fb7e85bb5faacb93dc0d5416699b2ed31eb0.

Fix: don't call the inherited methods on canvas

bug: skia: 9768
Change-Id: Ifb913bd30452ba8389399f709d40c7b58d6157d8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263776
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

samplecode/SampleClip.cpp

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index b5d6a78..a25bd54 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -547,7 +547,7 @@
     }
 
     void onDrawContent(SkCanvas* canvas) override {
-        SkMatrix mx = this->get44({0, 0, 400, 400});
+        SkMatrix44 mx = this->get44({0, 0, 400, 400});
 
         SkPaint paint;
         paint.setColor({0.75, 0.75, 0.75, 1});
@@ -612,12 +612,10 @@
     }
 
     void onDrawContent(SkCanvas* canvas) override {
-        SkMatrix mx = this->get44({0, 0, 300, 300});
-
         SkPaint paint;
 
         canvas->save();
-        canvas->concat(mx);
+        canvas->concat(this->get44({0, 0, 300, 300}));
 
         const SkPoint* tex = nullptr;
         const SkColor* col = nullptr;