1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 46c09e0ca5..f0b341c5d0 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -17,6 +17,8 @@
 #include "SkTo.h"
 #include "SkUtils.h"
 
+#include <utility>
+
 class AutoAAClipValidate {
 public:
     AutoAAClipValidate(const SkAAClip& clip) : fClip(clip) {
@@ -690,8 +692,9 @@ void SkAAClip::swap(SkAAClip& other) {
     AUTO_AACLIP_VALIDATE(*this);
     other.validate();
 
-    SkTSwap(fBounds, other.fBounds);
-    SkTSwap(fRunHead, other.fRunHead);
+    using std::swap;
+    swap(fBounds, other.fBounds);
+    swap(fRunHead, other.fRunHead);
 }
 
 bool SkAAClip::set(const SkAAClip& src) {
@@ -1700,7 +1703,8 @@ bool SkAAClip::op(const SkAAClip& clipAOrig, const SkAAClip& clipBOrig,
     const SkAAClip* clipB = &clipBOrig;
 
     if (SkRegion::kReverseDifference_Op == op) {
-        SkTSwap(clipA, clipB);
+        using std::swap;
+        swap(clipA, clipB);
         op = SkRegion::kDifference_Op;
     }