From f08d1d0ce19c72bb911f059dcf916cf99a0a2467 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 18 Jun 2018 15:11:00 -0400 Subject: 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 include can be removed from SkTypes.h. Change-Id: If03d4ee07dbecda961aa9f0dc34d171ef5168753 Reviewed-on: https://skia-review.googlesource.com/135578 Reviewed-by: Hal Canary Reviewed-by: Mike Klein Commit-Queue: Ben Wagner --- src/utils/SkDashPath.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/utils') diff --git a/src/utils/SkDashPath.cpp b/src/utils/SkDashPath.cpp index e4840c84b6..fc73c9f5a7 100644 --- a/src/utils/SkDashPath.cpp +++ b/src/utils/SkDashPath.cpp @@ -10,6 +10,8 @@ #include "SkPointPriv.h" #include "SkStrokeRec.h" +#include + static inline int is_even(int x) { return !(x & 1); } @@ -108,7 +110,8 @@ static bool clip_line(SkPoint pts[2], const SkRect& bounds, SkScalar intervalLen SkScalar maxXY = (&pts[1].fX)[xyOffset]; bool swapped = maxXY < minXY; if (swapped) { - SkTSwap(minXY, maxXY); + using std::swap; + swap(minXY, maxXY); } SkASSERT(minXY <= maxXY); @@ -137,7 +140,8 @@ static bool clip_line(SkPoint pts[2], const SkRect& bounds, SkScalar intervalLen SkASSERT(maxXY >= minXY); if (swapped) { - SkTSwap(minXY, maxXY); + using std::swap; + swap(minXY, maxXY); } (&pts[0].fX)[xyOffset] = minXY; (&pts[1].fX)[xyOffset] = maxXY; @@ -196,7 +200,8 @@ static bool cull_path(const SkPath& srcPath, const SkStrokeRec& rec, SkScalar maxX = pts[1].fX; if (dx < 0) { - SkTSwap(minX, maxX); + using std::swap; + swap(minX, maxX); } SkASSERT(minX <= maxX); @@ -219,7 +224,8 @@ static bool cull_path(const SkPath& srcPath, const SkStrokeRec& rec, SkASSERT(maxX >= minX); if (dx < 0) { - SkTSwap(minX, maxX); + using std::swap; + swap(minX, maxX); } pts[0].fX = minX; pts[1].fX = maxX; -- cgit v1.2.3