diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2017-01-11 17:21:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 17:22:12 +0000 |
| commit | c456b73fef9589bbdc5eb83eaa83e53c357bb3da (patch) | |
| tree | bcb8f75efaf1523bc781fa592f56d7ff86598c32 /bench | |
| parent | bc6b99d22e8d9f6543ffffdc846e40e8075046c5 (diff) | |
Revert "SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h"
This reverts commit a5494f117086d712855e4b6289c58c92d1549bcf.
Reason for revert: Broke Google3
Original change's description:
> 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>
>
TBR=halcanary@google.com,bungeman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ie8bd176121c3ee83c110d66c0d0ac65e09bfc9c5
Reviewed-on: https://skia-review.googlesource.com/6884
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@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, 3 insertions, 7 deletions
diff --git a/bench/AndroidCodecBench.h b/bench/AndroidCodecBench.h index 528ecabb6b..8cdd7fec04 100644 --- a/bench/AndroidCodecBench.h +++ b/bench/AndroidCodecBench.h @@ -9,7 +9,6 @@ #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 dc44704ab6..5b4db24004 100644 --- a/bench/CodecBench.h +++ b/bench/CodecBench.h @@ -9,7 +9,6 @@ #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 e5048f8d7b..9159bcf9ad 100644 --- a/bench/ColorCodecBench.h +++ b/bench/ColorCodecBench.h @@ -9,7 +9,6 @@ #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 34aaee8dd0..c9456db969 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -25,9 +25,8 @@ #include "Stats.h" #include "SkAndroidCodec.h" -#include "SkAutoMalloc.h" -#include "SkBBoxHierarchy.h" #include "SkBitmapRegionDecoder.h" +#include "SkBBoxHierarchy.h" #include "SkCanvas.h" #include "SkCodec.h" #include "SkCommonFlags.h" @@ -39,13 +38,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> |