Change name from ScaleToSides to SkScaleToSides.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1618283004

Review URL: https://codereview.chromium.org/1618283004

diff --git a/fuzz/FuzzScaleToSides.cpp b/fuzz/FuzzScaleToSides.cpp
index de98562..e7cf78a 100644 (file)
--- a/fuzz/FuzzScaleToSides.cpp
+++ b/fuzz/FuzzScaleToSides.cpp
@@ -35,7 +35,7 @@ DEF_FUZZ(ScaleToSides, fuzz) {
         fuzz->signalBoring();
     }
     SkDebugf("%g %g %g %g\n", radius1, radius2, width, scale);
-    ScaleToSides::AdjustRadii(width, scale, &radius1, &radius2);
+    SkScaleToSides::AdjustRadii(width, scale, &radius1, &radius2);
 
     // TODO(mtklein): add fuzz->keepResult()
     volatile float junk = 0.0f;

diff --git a/src/core/SkRRect.cpp b/src/core/SkRRect.cpp
index ca4fd56..2e03f81 100644 (file)
--- a/src/core/SkRRect.cpp
+++ b/src/core/SkRRect.cpp
@@ -179,10 +179,10 @@ void SkRRect::setRectRadii(const SkRect& rect, const SkVector radii[4]) {
     scale = compute_min_scale(fRadii[3].fY, fRadii[0].fY, height, scale);
 
     if (scale < 1.0) {
-        ScaleToSides::AdjustRadii(width,  scale, &fRadii[0].fX, &fRadii[1].fX);
-        ScaleToSides::AdjustRadii(height, scale, &fRadii[1].fY, &fRadii[2].fY);
-        ScaleToSides::AdjustRadii(width,  scale, &fRadii[2].fX, &fRadii[3].fX);
-        ScaleToSides::AdjustRadii(height, scale, &fRadii[3].fY, &fRadii[0].fY);
+        SkScaleToSides::AdjustRadii(width,  scale, &fRadii[0].fX, &fRadii[1].fX);
+        SkScaleToSides::AdjustRadii(height, scale, &fRadii[1].fY, &fRadii[2].fY);
+        SkScaleToSides::AdjustRadii(width,  scale, &fRadii[2].fX, &fRadii[3].fX);
+        SkScaleToSides::AdjustRadii(height, scale, &fRadii[3].fY, &fRadii[0].fY);
     }
 
     // At this point we're either oval, simple, or complex (not empty or rect).

diff --git a/src/core/SkScaleToSides.h b/src/core/SkScaleToSides.h
index 81ce4c4..49201d0 100644 (file)
--- a/src/core/SkScaleToSides.h
+++ b/src/core/SkScaleToSides.h
@@ -12,7 +12,7 @@
 #include "SkScalar.h"
 #include "SkTypes.h"
 
-class ScaleToSides {
+class SkScaleToSides {
 public:
     // This code assumes that a and b fit in a float, and therefore the resulting smaller value
     // of a and b will fit in a float. The side of the rectangle may be larger than a float.

diff --git a/tests/ScaleToSidesTest.cpp b/tests/ScaleToSidesTest.cpp
index 513f0c9..4159ce4 100644 (file)
--- a/tests/ScaleToSidesTest.cpp
+++ b/tests/ScaleToSidesTest.cpp
@@ -48,7 +48,7 @@ DEF_TEST(ScaleToSides, reporter) {
                             scale = std::min(scale, interestingValues[s-1]);
                         }
                         if (scale < 1.0 && scale > 0.0) {
-                            ScaleToSides::AdjustRadii(width, scale, &radius1, &radius2);
+                            SkScaleToSides::AdjustRadii(width, scale, &radius1, &radius2);
                         }
                     }
                 }