commit 3ef77ddf9ec435d781cf65f40b08df3b86b414c6
author Mike Reed <reed@google.com> Mon Apr 06 10:41:09 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 06 15:34:17 2020 +0000
tree 60c46d324cdcb90a945fad8b338e97cda303c779
parent 6d3bc2951dd61e25752a7370b56880222517654e

clean up public m44 and camera api

saveCamera() is no longer experimental

In a separate CL, will stage changes to concat virtual to take M44.

Change-Id: Iaf37ce2f24ab1223c54aeb1e79eaebf18f87fece
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281589
Reviewed-by: Brian Osman <brianosman@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 cd7bb57..b3f4a16 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -742,24 +742,16 @@
     FOR_EACH_TOP_DEVICE(device->setInvCamera(invc));
 }
 
-int SkCanvas::experimental_saveCamera(const SkM44& projection, const SkM44& camera) {
+int SkCanvas::saveCamera(const SkM44& projection, const SkM44& camera) {
     // TODO: add a virtual for this, and update clients (e.g. chrome)
     int n = this->save();
-    this->concat44(projection * camera);
+    this->concat(projection * camera);
     fCameraStack.push_back(CameraRec(fMCRec, camera));
     this->notifyCameraChanged();
 
     return n;
 }
 
-int SkCanvas::experimental_saveCamera(const SkScalar projection[16],
-                                      const SkScalar camera[16]) {
-    SkM44 proj, cam;
-    proj.setColMajor(projection);
-    cam.setColMajor(camera);
-    return this->experimental_saveCamera(proj, cam);
-}
-
 void SkCanvas::restore() {
     if (fMCRec->fDeferredSaveCount > 0) {
         SkASSERT(fSaveCount > 1);
@@ -1532,20 +1524,16 @@
     this->didConcat(matrix);
 }
 
-void SkCanvas::concat44(const SkScalar colMajor[16]) {
+void SkCanvas::concat(const SkM44& m) {
     this->checkForDeferredSave();
 
-    fMCRec->fMatrix.preConcat16(colMajor);
+    fMCRec->fMatrix.preConcat(m);
 
     fIsScaleTranslate = fMCRec->fMatrix.isScaleTranslate();
 
     FOR_EACH_TOP_DEVICE(device->setGlobalCTM(fMCRec->fMatrix));
 
-    this->didConcat44(colMajor);
-}
-
-void SkCanvas::concat44(const SkM44& m) {
-    this->concat44(SkMatrixPriv::M44ColMajor(m));
+    this->didConcat44(SkMatrixPriv::M44ColMajor(m));
 }
 
 void SkCanvas::internalSetMatrix(const SkMatrix& matrix) {
@@ -1896,18 +1884,6 @@
     }
 }
 
-void SkCanvas::getLocalToDevice(SkScalar colMajor[16]) const {
-    this->getLocalToDevice().getColMajor(colMajor);
-}
-
-void SkCanvas::experimental_getLocalToWorld(SkScalar colMajor[16]) const {
-    this->experimental_getLocalToWorld().getColMajor(colMajor);
-}
-
-void SkCanvas::experimental_getLocalToCamera(SkScalar colMajor[16]) const {
-    this->experimental_getLocalToCamera().getColMajor(colMajor);
-}
-
 GrRenderTargetContext* SkCanvas::internal_private_accessTopLayerRenderTargetContext() {
     SkBaseDevice* dev = this->getTopDevice();
     return dev ? dev->accessRenderTargetContext() : nullptr;