diff options
| author |  Hal Canary <halcanary@google.com> | 2017-01-11 12:44:43 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 18:55:34 +0000 |
| commit | 95e3c058ef633782f7549e9e1c2727d60dbc8ee5 (patch) | |
| tree | 4db526398bc87c48db4565a2046b9321b7e2ee10 /bench | |
| parent | 000ca636e6de2e2b8bf9c82e3dee2d7ad8e1bed8 (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 'bench')
| -rw-r--r-- | bench/AndroidCodecBench.h | 1 | ||||
| -rw-r--r-- | bench/CodecBench.h | 1 | ||||
| -rw-r--r-- | bench/ColorCodecBench.h | 1 | ||||
| -rw-r--r-- | bench/nanobench.cpp | 7 |
4 files changed, 7 insertions, 3 deletions
diff --git a/bench/AndroidCodecBench.h b/bench/AndroidCodecBench.h index 8cdd7fec04..528ecabb6b 100644 --- a/bench/AndroidCodecBench.h +++ b/bench/AndroidCodecBench.h @@ -9,6 +9,7 @@ #define AndroidCodecBench_DEFINED #include "Benchmark.h" +#include "SkAutoMalloc.h" #include "SkData.h" #include "SkImageInfo.h" #include "SkRefCnt.h" diff --git a/bench/CodecBench.h b/bench/CodecBench.h index 5b4db24004..dc44704ab6 100644 --- a/bench/CodecBench.h +++ b/bench/CodecBench.h @@ -9,6 +9,7 @@ #define CodecBench_DEFINED #include "Benchmark.h" +#include "SkAutoMalloc.h" #include "SkData.h" #include "SkImageInfo.h" #include "SkRefCnt.h" diff --git a/bench/ColorCodecBench.h b/bench/ColorCodecBench.h index 9159bcf9ad..e5048f8d7b 100644 --- a/bench/ColorCodecBench.h +++ b/bench/ColorCodecBench.h @@ -9,6 +9,7 @@ #define ColorCodecBench_DEFINED #include "Benchmark.h" +#include "SkAutoMalloc.h" #include "SkData.h" #include "SkImageInfo.h" 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> |