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 /src/core/SkColorSpace_ICC.cpp | |
| 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 '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" |