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/core/SkRRect.cpp | |
| 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/core/SkRRect.cpp')
| -rw-r--r-- | src/core/SkRRect.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/core/SkRRect.cpp b/src/core/SkRRect.cpp index 46e83aec0f..01e76d5db1 100644 --- a/src/core/SkRRect.cpp +++ b/src/core/SkRRect.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include <cmath> #include "SkRRectPriv.h" #include "SkScopeExit.h" #include "SkBuffer.h" @@ -13,6 +12,9 @@ #include "SkMatrix.h" #include "SkScaleToSides.h" +#include <cmath> +#include <utility> + /////////////////////////////////////////////////////////////////////////////// void SkRRect::setRectXY(const SkRect& rect, SkScalar xRad, SkScalar yRad) { @@ -430,20 +432,21 @@ bool SkRRect::transform(const SkMatrix& matrix, SkRRect* dst) const { } // Now swap as necessary. + using std::swap; if (flipX) { if (flipY) { // Swap with opposite corners - SkTSwap(dst->fRadii[kUpperLeft_Corner], dst->fRadii[kLowerRight_Corner]); - SkTSwap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kLowerLeft_Corner]); + swap(dst->fRadii[kUpperLeft_Corner], dst->fRadii[kLowerRight_Corner]); + swap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kLowerLeft_Corner]); } else { // Only swap in x - SkTSwap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kUpperLeft_Corner]); - SkTSwap(dst->fRadii[kLowerRight_Corner], dst->fRadii[kLowerLeft_Corner]); + swap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kUpperLeft_Corner]); + swap(dst->fRadii[kLowerRight_Corner], dst->fRadii[kLowerLeft_Corner]); } } else if (flipY) { // Only swap in y - SkTSwap(dst->fRadii[kUpperLeft_Corner], dst->fRadii[kLowerLeft_Corner]); - SkTSwap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kLowerRight_Corner]); + swap(dst->fRadii[kUpperLeft_Corner], dst->fRadii[kLowerLeft_Corner]); + swap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kLowerRight_Corner]); } if (!AreRectAndRadiiValid(dst->fRect, dst->fRadii)) { |