diff options
author | Hal Canary <halcanary@google.com> | 2017-01-10 15:02:26 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 15:36:45 +0000 |
commit | a5494f117086d712855e4b6289c58c92d1549bcf (patch) | |
tree | 1f43412b8e0d5047f738d26e1bb165b29b542af8 /src/core/SkColorSpace_ICC.cpp | |
parent | 21d742dbafde600d7f0d3b7de95cd083dd54ad97 (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 'src/core/SkColorSpace_ICC.cpp')
-rw-r--r-- | src/core/SkColorSpace_ICC.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkColorSpace_ICC.cpp b/src/core/SkColorSpace_ICC.cpp index 29291a3e00..ff4b9018dd 100644 --- a/src/core/SkColorSpace_ICC.cpp +++ b/src/core/SkColorSpace_ICC.cpp @@ -5,11 +5,12 @@ * found in the LICENSE file. */ +#include "SkAutoMalloc.h" #include "SkColorSpace.h" +#include "SkColorSpacePriv.h" #include "SkColorSpace_A2B.h" #include "SkColorSpace_Base.h" #include "SkColorSpace_XYZ.h" -#include "SkColorSpacePriv.h" #include "SkEndian.h" #include "SkFixed.h" #include "SkICCPriv.h" |