Rename SkMatrix::get(Min|Max)Stretch to get(Min|Max)Scale

src/core/SkMatrix.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMatrix.h"
 #include "SkFloatBits.h"
 #include "SkOnce.h"
@@ skipping 1438 matching lines @@
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 enum MinOrMax {
     kMin_MinOrMax,
     kMax_MinOrMax
 };
 
-template <MinOrMax MIN_OR_MAX> SkScalar get_stretch_factor(SkMatrix::TypeMask typeMask,
-                                                           const SkScalar m[9]) {
+template <MinOrMax MIN_OR_MAX> SkScalar get_scale_factor(SkMatrix::TypeMask typeMask,
+                                                         const SkScalar m[9]) {
     if (typeMask & SkMatrix::kPerspective_Mask) {
         return -1;
     }
     if (SkMatrix::kIdentity_Mask == typeMask) {
         return 1;
     }
     if (!(typeMask & SkMatrix::kAffine_Mask)) {
         if (kMin_MinOrMax == MIN_OR_MAX) {
              return SkMinScalar(SkScalarAbs(m[SkMatrix::kMScaleX]),
                                 SkScalarAbs(m[SkMatrix::kMScaleY]));
@@ skipping 32 matching lines @@
         if (kMin_MinOrMax == MIN_OR_MAX) {
             chosenRoot = apluscdiv2 - x;
         } else {
             chosenRoot = apluscdiv2 + x;
         }
     }
     SkASSERT(chosenRoot >= 0);
     return SkScalarSqrt(chosenRoot);
 }
 
-SkScalar SkMatrix::getMinStretch() const {
-    return get_stretch_factor<kMin_MinOrMax>(this->getType(), fMat);
+SkScalar SkMatrix::getMinScale() const {
+    return get_scale_factor<kMin_MinOrMax>(this->getType(), fMat);
 }
 
-SkScalar SkMatrix::getMaxStretch() const {
-    return get_stretch_factor<kMax_MinOrMax>(this->getType(), fMat);
+SkScalar SkMatrix::getMaxScale() const {
+    return get_scale_factor<kMax_MinOrMax>(this->getType(), fMat);
 }
 
 static void reset_identity_matrix(SkMatrix* identity) {
     identity->reset();
 }
 
 const SkMatrix& SkMatrix::I() {
     // If you can use C++11 now, you might consider replacing this with a constexpr constructor.
     static SkMatrix gIdentity;
     SK_DECLARE_STATIC_ONCE(once);
@@ skipping 199 matching lines @@
         rotation1->fX = cos1;
         rotation1->fY = sin1;
     }
     if (NULL != rotation2) {
         rotation2->fX = cos2;
         rotation2->fY = sin2;
     }
 
     return true;
 }