Stop using SkTSwap.

Use std::swap instead. It does not appear that any external user
specializes SkTSwap, but some may still use it. This removes all use in
Skia so that SkTSwap can later be removed in a smaller CL. After that
the <utility> include can be removed from SkTypes.h.

Change-Id: If03d4ee07dbecda961aa9f0dc34d171ef5168753
Reviewed-on: https://skia-review.googlesource.com/135578
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/core/SkScaleToSides.h b/src/core/SkScaleToSides.h
index c700891061..61bff63a2b 100644
--- a/src/core/SkScaleToSides.h
+++ b/src/core/SkScaleToSides.h
@@ -8,10 +8,12 @@
 #ifndef SkScaleToSides_DEFINED
 #define SkScaleToSides_DEFINED
 
-#include <cmath>
 #include "SkScalar.h"
 #include "SkTypes.h"
 
+#include <cmath>
+#include <utility>
+
 class SkScaleToSides {
 public:
     // This code assumes that a and b fit in a float, and therefore the resulting smaller value
@@ -30,7 +32,8 @@ public:
 
             // Force minRadius to be the smaller of the two.
             if (*minRadius > *maxRadius) {
-                SkTSwap(minRadius, maxRadius);
+                using std::swap;
+                swap(minRadius, maxRadius);
             }
 
             // newMinRadius must be float in order to give the actual value of the radius.