commit 95e3c058ef633782f7549e9e1c2727d60dbc8ee5
author Hal Canary <halcanary@google.com> Wed Jan 11 12:44:43 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 11 18:55:34 2017 +0000
tree 4db526398bc87c48db4565a2046b9321b7e2ee10
parent 000ca636e6de2e2b8bf9c82e3dee2d7ad8e1bed8

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>

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index c9456db..34aaee8 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -25,8 +25,9 @@
 #include "Stats.h"
 
 #include "SkAndroidCodec.h"
-#include "SkBitmapRegionDecoder.h"
+#include "SkAutoMalloc.h"
 #include "SkBBoxHierarchy.h"
+#include "SkBitmapRegionDecoder.h"
 #include "SkCanvas.h"
 #include "SkCodec.h"
 #include "SkCommonFlags.h"
@@ -38,13 +39,13 @@
 #include "SkOSPath.h"
 #include "SkPictureRecorder.h"
 #include "SkPictureUtils.h"
+#include "SkSVGDOM.h"
+#include "SkScan.h"
 #include "SkString.h"
 #include "SkSurface.h"
-#include "SkSVGDOM.h"
 #include "SkTaskGroup.h"
 #include "SkThreadUtils.h"
 #include "ThermalManager.h"
-#include "SkScan.h"
 
 #include <stdlib.h>