From b3345feca2741cef2073d18da414237589528dd0 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 20 Jun 2018 15:23:23 +0000 Subject: Replace SkTSwap with std::swap/swap. Skia is moving to normalize on std::swap instead of its own SkTSwap. This removes the use of SkTSwap from PDFium so that Skia can remove it. Change-Id: If77708c1f363f4fd82a4c7905c7fbb2060900532 Reviewed-on: https://pdfium-review.googlesource.com/35470 Reviewed-by: dsinclair Commit-Queue: dsinclair --- core/fxge/skia/fx_skia_device.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 0329eac104..adc02fe8a4 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -2052,8 +2052,8 @@ bool CFX_SkiaDeviceDriver::DrawShading(const CPDF_ShadingPattern* pPattern, // if the gradient is horizontal or vertical, modify the draw rectangle if (pts[0].fX == pts[1].fX) { // vertical if (pts[0].fY > pts[1].fY) { - SkTSwap(pts[0].fY, pts[1].fY); - SkTSwap(clipStart, clipEnd); + std::swap(pts[0].fY, pts[1].fY); + std::swap(clipStart, clipEnd); } if (clipStart) skRect.fTop = SkTMax(skRect.fTop, pts[0].fY); @@ -2061,8 +2061,8 @@ bool CFX_SkiaDeviceDriver::DrawShading(const CPDF_ShadingPattern* pPattern, skRect.fBottom = SkTMin(skRect.fBottom, pts[1].fY); } else if (pts[0].fY == pts[1].fY) { // horizontal if (pts[0].fX > pts[1].fX) { - SkTSwap(pts[0].fX, pts[1].fX); - SkTSwap(clipStart, clipEnd); + std::swap(pts[0].fX, pts[1].fX); + std::swap(clipStart, clipEnd); } if (clipStart) skRect.fLeft = SkTMax(skRect.fLeft, pts[0].fX); -- cgit v1.2.3