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 /samplecode | |
| 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 'samplecode')
| -rw-r--r-- | samplecode/SamplePathClip.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index 2db72c9f75..ab9fb4bd48 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -20,6 +20,8 @@ #include "SkUtils.h" #include "SkView.h" +#include <utility> + class PathClipView : public SampleView { public: SkRect fOval; @@ -81,7 +83,8 @@ static int clip_line(const SkRect& bounds, SkPoint p0, SkPoint p1, SkPoint edges } if (p0.fY > p1.fY) { - SkTSwap(p0, p1); + using std::swap; + swap(p0, p1); } // now we're monotonic in Y: p0 <= p1 if (p1.fY <= bounds.top() || p0.fY >= bounds.bottom()) { @@ -101,7 +104,8 @@ static int clip_line(const SkRect& bounds, SkPoint p0, SkPoint p1, SkPoint edges // Now p0...p1 is strictly inside bounds vertically, so we just need to clip horizontally if (p0.fX > p1.fX) { - SkTSwap(p0, p1); + using std::swap; + swap(p0, p1); } // now we're left-to-right: p0 .. p1 |