commit 2ac6ce8e6e9ec2d7bdbf426453d155dd77941f35
author Mike Reed <reed@google.com> Fri Jan 15 12:26:22 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 15 18:37:46 2021 +0000
tree 2f7982dc55e9e7c6c7ce95bd04de0d2b1cf2a1ee
parent e6c67c5bc43bb4e7ae53e434ac8b0e2a5d13dd3e

Simplify common case for recttorect

Change-Id: I70e295a677b8cac3d578e3cd57472c833af03877
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354336
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

samplecode/SampleCamera.cpp

diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index abde083..41da126 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -36,10 +36,8 @@
             if (GetResourceAsBitmap(resource, &bm)) {
                 SkRect src = { 0, 0, SkIntToScalar(bm.width()), SkIntToScalar(bm.height()) };
                 SkRect dst = { -150, -150, 150, 150 };
-                SkMatrix matrix;
-                matrix.setRectToRect(src, dst, SkMatrix::kFill_ScaleToFit);
                 fShaders.push_back(bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear),
-                                                 matrix));
+                                                 SkMatrix::RectToRect(src, dst)));
             }
         }
         this->setBGColor(0xFFDDDDDD);

samplecode/SampleHT.cpp

diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index 940cd2f..5547b31 100644
--- a/samplecode/SampleHT.cpp
+++ b/samplecode/SampleHT.cpp
@@ -31,10 +31,7 @@
 }
 
 static bool oval_contains(const SkRect& r, SkScalar x, SkScalar y) {
-    SkMatrix m;
-    m.setRectToRect(r, gUnitSquare, SkMatrix::kFill_ScaleToFit);
-    SkPoint pt;
-    m.mapXY(x, y, &pt);
+    SkPoint pt = SkMatrix::RectToRect(r, gUnitSquare).mapXY(x, y);
     return SkPointPriv::LengthSqd(pt) <= 1;
 }
 

samplecode/SampleStrokePath.cpp

diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index dace79a..a77a915 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp
@@ -35,9 +35,7 @@
     paint.setStrokeJoin(SkPaint::kRound_Join);
     paint.setStyle(SkPaint::kStroke_Style);
 
-    SkMatrix matrix;
-    matrix.setRectToRect(srcR, dstR, SkMatrix::kCenter_ScaleToFit);
-    canvas->concat(matrix);
+    canvas->concat(SkMatrix::RectToRect(srcR, dstR, SkMatrix::kCenter_ScaleToFit));
 
     canvas->drawPath(path, paint);
 }

samplecode/SampleXfer.cpp

diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index 40feb3b..68b179e 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -263,8 +263,7 @@
 
         paint.setColor(SK_ColorRED);
         paint.setStroke(false);
-        SkPoint loc = SkMatrix::MakeRectToRect({0,0,1,1}, fDomain, SkMatrix::kFill_ScaleToFit)
-                      .mapXY(fCubic.B, fCubic.C);
+        SkPoint loc = SkMatrix::RectToRect({0,0,1,1}, fDomain).mapXY(fCubic.B, fCubic.C);
         canvas->drawCircle(loc.fX, loc.fY, 8, paint);
 
         SkString str;