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>

2 files changed, 9 insertions, 3 deletions

diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp
index 7c5c672128..2415806863 100644
--- a/gm/complexclip3.cpp
+++ b/gm/complexclip3.cpp
@@ -9,6 +9,8 @@
 #include "SkCanvas.h"
 #include "SkPath.h"
 
+#include <utility>
+
 namespace skiagm {
 
 constexpr SkColor gPathColor = SK_ColorYELLOW;
@@ -44,7 +46,8 @@ protected:
         SkPath* secondClip = &clipComplex;
 
         if (!fDoSimpleClipFirst) {
-            SkTSwap<SkPath*>(firstClip, secondClip);
+            using std::swap;
+            swap(firstClip, secondClip);
         }
 
         SkPaint paint;
diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp
index bfff3f3658..4c1f028326 100644
--- a/gm/dashcubics.cpp
+++ b/gm/dashcubics.cpp
@@ -14,6 +14,8 @@
 #include "SkTArray.h"
 #include "SkTrimPathEffect.h"
 
+#include <utility>
+
 /*
  *  Inspired by http://code.google.com/p/chromium/issues/detail?id=112145
  */
@@ -128,8 +130,9 @@ protected:
                 start -= SkScalarFloorToScalar(start);
                 stop  -= SkScalarFloorToScalar(stop);
                 if (start > stop) {
-                    SkTSwap(start, stop);
-                    SkTSwap(normalMode, invertedMode);
+                    using std::swap;
+                    swap(start, stop);
+                    swap(normalMode, invertedMode);
                 }
             }