aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontConfigInterface_direct.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-01-11 12:44:43 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-11 18:55:34 +0000
commit95e3c058ef633782f7549e9e1c2727d60dbc8ee5 (patch)
tree4db526398bc87c48db4565a2046b9321b7e2ee10 /src/ports/SkFontConfigInterface_direct.cpp
parent000ca636e6de2e2b8bf9c82e3dee2d7ad8e1bed8 (diff)
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 <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/ports/SkFontConfigInterface_direct.cpp')
-rw-r--r--src/ports/SkFontConfigInterface_direct.cpp2
1 files changed, 1 insertions, 1 deletions
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 <fontconfig/fontconfig.h>
#include <unistd.h>