From 95e3c058ef633782f7549e9e1c2727d60dbc8ee5 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 11 Jan 2017 12:44:43 -0500 Subject: 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);" Revert "Revert 'SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h'" This reverts commit c456b73fef9589bbdc5eb83eaa83e53c357bb3da. Change-Id: Ie2c1a17c20134b8ceab85a68b3ae3e61c24fbaab Reviewed-on: https://skia-review.googlesource.com/6886 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- src/ports/SkFontConfigInterface_direct.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ports/SkFontConfigInterface_direct.cpp') diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index df68fae0a8..c1a73e626c 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -7,6 +7,7 @@ /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */ +#include "SkAutoMalloc.h" #include "SkBuffer.h" #include "SkDataTable.h" #include "SkFixed.h" @@ -19,7 +20,6 @@ #include "SkTDArray.h" #include "SkTemplates.h" #include "SkTypeface.h" -#include "SkTypes.h" #include #include -- cgit v1.2.3