aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/nanobench.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-01-10 15:02:26 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-11 15:36:45 +0000
commita5494f117086d712855e4b6289c58c92d1549bcf (patch)
tree1f43412b8e0d5047f738d26e1bb165b29b542af8 /bench/nanobench.cpp
parent21d742dbafde600d7f0d3b7de95cd083dd54ad97 (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);" Change-Id: Idacd86ca09e22bf092422228599ae0d9bedded88 Reviewed-on: https://skia-review.googlesource.com/4543 Reviewed-by: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'bench/nanobench.cpp')
-rw-r--r--bench/nanobench.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index c9456db969..34aaee8dd0 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>