commit 46f5c5f08b619a039104aff7aec342bd22619e45
author Mike Reed <reed@google.com> Thu Feb 20 15:42:29 2020 -0500
committer Mike Reed <reed@google.com> Fri Feb 21 15:50:31 2020 +0000
tree 264741ef82ee29172cc4f9bde055dc12252b7ae3
parent f8f9cd84fa0483de1b7d408859c4e8ae84817f16

Make SkM44 public

Need to migrate clients from private/ to core/ include
Unexperimentalize concat44() methods on SkCanvas

Change-Id: I64b8816722a9d93316cb8b8691d2d9a3e36f167f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272464
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>

samplecode/Sample3D.cpp

diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 0caa247..3ec67eb 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "include/core/SkCanvas.h"
+#include "include/core/SkM44.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkRRect.h"
-#include "include/private/SkM44.h"
 #include "include/utils/SkRandom.h"
 #include "samplecode/Sample.h"
 #include "tools/Resources.h"
@@ -261,7 +261,7 @@
     virtual void drawContent(SkCanvas* canvas, SkColor, int index, bool drawFront) = 0;
 
     void setClickToWorld(SkCanvas* canvas, const SkM44& clickM) {
-        auto l2d = canvas->experimental_getLocalToDevice();
+        auto l2d = canvas->getLocalToDevice();
         fWorldToClick = inv(clickM) * l2d;
         fClickToWorld = inv(fWorldToClick);
     }
@@ -270,7 +270,7 @@
         if (!canvas->getGrContext() && !(fFlags & kCanRunOnCPU)) {
             return;
         }
-        SkM44 clickM = canvas->experimental_getLocalToDevice();
+        SkM44 clickM = canvas->getLocalToDevice();
 
         canvas->save();
         canvas->translate(DX, DY);
@@ -287,7 +287,7 @@
                 SkM44 trans = SkM44::Translate(200, 200, 0);   // center of the rotation
                 SkM44 m = fRotateAnimator.rotation() * fRotation * f.asM44(200);
 
-                canvas->experimental_concat44(trans * m * inv(trans));
+                canvas->concat44(trans * m * inv(trans));
                 this->drawContent(canvas, f.fColor, index++, drawFront);
             }
         }
@@ -414,7 +414,7 @@
     }
 
     void drawContent(SkCanvas* canvas, SkColor color, int index, bool drawFront) override {
-        if (!drawFront || !front(canvas->experimental_getLocalToDevice())) {
+        if (!drawFront || !front(canvas->getLocalToDevice())) {
             return;
         }
 
@@ -473,7 +473,7 @@
     }
 
     void drawContent(SkCanvas* canvas, SkColor color, int index, bool drawFront) override {
-        if (!drawFront || !front(canvas->experimental_getLocalToDevice())) {
+        if (!drawFront || !front(canvas->getLocalToDevice())) {
             return;
         }
 

samplecode/SampleClip.cpp

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 90f2c7f..4f4ff25 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -527,7 +527,7 @@
 
         if (fShowUnclipped) {
             canvas->save();
-            canvas->experimental_concat44(mx);
+            canvas->concat44(mx);
             paint.setAlphaf(0.33f);
             canvas->drawPath(fPath, paint);
             paint.setAlphaf(1.f);
@@ -542,7 +542,7 @@
             planeColor = SK_ColorRED;
         }
         canvas->save();
-        canvas->experimental_concat44(mx);
+        canvas->concat44(mx);
         canvas->drawPath(*path, paint);
         canvas->restore();
 
@@ -585,7 +585,7 @@
         SkPaint paint;
 
         canvas->save();
-        canvas->experimental_concat44(this->get44({0, 0, 300, 300}));
+        canvas->concat44(this->get44({0, 0, 300, 300}));
 
         const SkPoint* tex = nullptr;
         const SkColor* col = nullptr;