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>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index b7a73c2..6e4d534 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -737,7 +737,7 @@
 int SkCanvas::experimental_saveCamera(const SkM44& projection, const SkM44& camera) {
     // TODO: add a virtual for this, and update clients (e.g. chrome)
     int n = this->save();
-    this->experimental_concat44(projection * camera);
+    this->concat44(projection * camera);
     fCameraStack.push_back(CameraRec(fMCRec, camera));
     return n;
 }
@@ -1507,20 +1507,20 @@
     this->didConcat(matrix);
 }
 
-void SkCanvas::experimental_concat44(const SkScalar m[16]) {
+void SkCanvas::concat44(const SkScalar colMajor[16]) {
     this->checkForDeferredSave();
 
-    fMCRec->fMatrix.preConcat16(m);
+    fMCRec->fMatrix.preConcat16(colMajor);
 
     fIsScaleTranslate = fMCRec->fMatrix.isScaleTranslate();
 
     FOR_EACH_TOP_DEVICE(device->setGlobalCTM(fMCRec->fMatrix));
 
-    this->didConcat44(m);
+    this->didConcat44(colMajor);
 }
 
-void SkCanvas::experimental_concat44(const SkM44& m) {
-    this->experimental_concat44(SkMatrixPriv::M44ColMajor(m));
+void SkCanvas::concat44(const SkM44& m) {
+    this->concat44(SkMatrixPriv::M44ColMajor(m));
 }
 
 void SkCanvas::internalSetMatrix(const SkMatrix& matrix) {
@@ -1825,30 +1825,30 @@
     return fMCRec->fMatrix;
 }
 
-SkM44 SkCanvas::experimental_getLocalToDevice() const {
+SkM44 SkCanvas::getLocalToDevice() const {
     return fMCRec->fMatrix;
 }
 
 SkM44 SkCanvas::experimental_getLocalToWorld() const {
     if (fCameraStack.empty()) {
-        return this->experimental_getLocalToDevice();
+        return this->getLocalToDevice();
     } else {
         const auto& top = fCameraStack.back();
-        return top.fInvPostCamera * this->experimental_getLocalToDevice();
+        return top.fInvPostCamera * this->getLocalToDevice();
     }
 }
 
 SkM44 SkCanvas::experimental_getLocalToCamera() const {
     if (fCameraStack.empty()) {
-        return this->experimental_getLocalToDevice();
+        return this->getLocalToDevice();
     } else {
         const auto& top = fCameraStack.back();
-        return top.fCamera * top.fInvPostCamera * this->experimental_getLocalToDevice();
+        return top.fCamera * top.fInvPostCamera * this->getLocalToDevice();
     }
 }
 
-void SkCanvas::experimental_getLocalToDevice(SkScalar colMajor[16]) const {
-    this->experimental_getLocalToDevice().getColMajor(colMajor);
+void SkCanvas::getLocalToDevice(SkScalar colMajor[16]) const {
+    this->getLocalToDevice().getColMajor(colMajor);
 }
 
 void SkCanvas::experimental_getLocalToWorld(SkScalar colMajor[16]) const {