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 --- src/pdf/SkPDFDocument.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pdf') diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp index 577bac7252..7d914544e5 100644 --- a/src/pdf/SkPDFDocument.cpp +++ b/src/pdf/SkPDFDocument.cpp @@ -123,7 +123,7 @@ static sk_sp generate_page_tree(SkTArray>* pages) { // curNodes takes a reference to its items, which it passes to pageTree. int totalPageCount = pages->count(); SkTArray> curNodes; - curNodes.swap(pages); + curNodes.swap(*pages); // nextRoundNodes passes its references to nodes on to curNodes. int treeCapacity = kNodeSize; @@ -164,7 +164,7 @@ static sk_sp generate_page_tree(SkTArray>* pages) { } SkDEBUGCODE( for (const auto& n : curNodes) { SkASSERT(!n); } ); - curNodes.swap(&nextRoundNodes); + curNodes.swap(nextRoundNodes); nextRoundNodes.reset(); treeCapacity *= kNodeSize; } while (curNodes.count() > 1); -- cgit v1.2.3