diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-06-18 15:11:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 02:06:31 +0000 |
| commit | f08d1d0ce19c72bb911f059dcf916cf99a0a2467 (patch) | |
| tree | 65fed059b8bd2b730c86e202cc8475fb60b76455 /src/effects | |
| parent | 93724202640b1f5ae9ccf7646151c9c3bb5afa5c (diff) | |
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>
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkDashPathEffect.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index 830159253a..aa3803a95c 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -15,6 +15,8 @@ #include "SkTo.h" #include "SkWriteBuffer.h" +#include <utility> + SkDashImpl::SkDashImpl(const SkScalar intervals[], int count, SkScalar phase) : fPhase(0) , fInitialDashLength(-1) @@ -93,7 +95,8 @@ static bool cull_line(SkPoint* pts, const SkStrokeRec& rec, SkScalar maxX = pts[1].fX; if (dx < 0) { - SkTSwap(minX, maxX); + using std::swap; + swap(minX, maxX); } SkASSERT(minX < maxX); @@ -114,7 +117,8 @@ static bool cull_line(SkPoint* pts, 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; @@ -124,7 +128,8 @@ static bool cull_line(SkPoint* pts, const SkStrokeRec& rec, SkScalar maxY = pts[1].fY; if (dy < 0) { - SkTSwap(minY, maxY); + using std::swap; + swap(minY, maxY); } SkASSERT(minY < maxY); @@ -145,7 +150,8 @@ static bool cull_line(SkPoint* pts, const SkStrokeRec& rec, SkASSERT(maxY > minY); if (dy < 0) { - SkTSwap(minY, maxY); + using std::swap; + swap(minY, maxY); } pts[0].fY = minY; pts[1].fY = maxY; |