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>

tools/viewer/SlideDir.cpp

diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp
index 094e43c..23e4bb1 100644
--- a/tools/viewer/SlideDir.cpp
+++ b/tools/viewer/SlideDir.cpp
@@ -108,9 +108,8 @@
 
 SkMatrix SlideMatrix(const sk_sp<Slide>& slide, const SkRect& dst) {
     const auto slideSize = slide->getDimensions();
-    return SkMatrix::MakeRectToRect(SkRect::MakeIWH(slideSize.width(), slideSize.height()),
-                                    dst,
-                                    SkMatrix::kCenter_ScaleToFit);
+    return SkMatrix::RectToRect(SkRect::MakeIWH(slideSize.width(), slideSize.height()), dst,
+                                SkMatrix::kCenter_ScaleToFit);
 }
 
 } // namespace
@@ -180,9 +179,8 @@
         }
 
         // Map coords to slide space.
-        const auto xform = SkMatrix::MakeRectToRect(fRect,
-                                                    SkRect::MakeSize(fDir->fWinSize),
-                                                    SkMatrix::kCenter_ScaleToFit);
+        const auto xform = SkMatrix::RectToRect(fRect, SkRect::MakeSize(fDir->fWinSize),
+                                                SkMatrix::kCenter_ScaleToFit);
         const auto pt = xform.mapXY(x, y);
 
         return fTarget->fSlide->onMouse(pt.x(), pt.y(), state, modifiers);