From c456b73fef9589bbdc5eb83eaa83e53c357bb3da Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Wed, 11 Jan 2017 17:21:57 +0000 Subject: Revert "SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h" This reverts commit a5494f117086d712855e4b6289c58c92d1549bcf. Reason for revert: Broke Google3 Original change's description: > SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h > > * SkAutoFree moved to SkTemplates.h (now implmented with unique_ptr). > > * SkAutoMalloc and SkAutoSMalloc moved to SkAutoMalloc.h > > * "SkAutoFree X(sk_malloc_throw(N));" --> "SkAutoMalloc X(N);" > > Change-Id: Idacd86ca09e22bf092422228599ae0d9bedded88 > Reviewed-on: https://skia-review.googlesource.com/4543 > Reviewed-by: Ben Wagner > Reviewed-by: Mike Reed > Commit-Queue: Hal Canary > TBR=halcanary@google.com,bungeman@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ie8bd176121c3ee83c110d66c0d0ac65e09bfc9c5 Reviewed-on: https://skia-review.googlesource.com/6884 Commit-Queue: Kevin Lubick Reviewed-by: Kevin Lubick --- tests/YUVTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/YUVTest.cpp') diff --git a/tests/YUVTest.cpp b/tests/YUVTest.cpp index 0c31c0929a..913997b3c3 100644 --- a/tests/YUVTest.cpp +++ b/tests/YUVTest.cpp @@ -5,9 +5,8 @@ * found in the LICENSE file. */ -#include "Resources.h" -#include "SkAutoMalloc.h" #include "SkCodec.h" +#include "Resources.h" #include "SkStream.h" #include "SkTemplates.h" #include "SkYUVSizeInfo.h" -- cgit v1.2.3