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 --- tools/viewer/BisectSlide.cpp | 5 ++++- tools/viewer/SlideDir.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'tools/viewer') diff --git a/tools/viewer/BisectSlide.cpp b/tools/viewer/BisectSlide.cpp index 38ab3c3ffd..0239ef2b0d 100644 --- a/tools/viewer/BisectSlide.cpp +++ b/tools/viewer/BisectSlide.cpp @@ -11,6 +11,8 @@ #include "SkPicture.h" #include "SkStream.h" +#include + #ifdef SK_XML #include "SkDOM.h" #include "../experimental/svg/model/SkSVGDOM.h" @@ -74,7 +76,8 @@ bool BisectSlide::onChar(SkUnichar c) { switch (c) { case 'X': if (!fTossedPaths.empty()) { - SkTSwap(fFoundPaths, fTossedPaths); + using std::swap; + swap(fFoundPaths, fTossedPaths); if ('X' == fTrail.back()) { fTrail.pop_back(); } else { diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp index 41bff87b79..0cc1230b38 100644 --- a/tools/viewer/SlideDir.cpp +++ b/tools/viewer/SlideDir.cpp @@ -25,6 +25,7 @@ #include "SkTypeface.h" #include +#include namespace { @@ -147,8 +148,9 @@ public: void startUnfocus() { SkASSERT(fTarget); - SkTSwap(fM0, fM1); - SkTSwap(fOpacity0, fOpacity1); + using std::swap; + swap(fM0, fM1); + swap(fOpacity0, fOpacity1); fTimeBase = 0; fState = State::kUnfocusing; -- cgit v1.2.3