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 /include/core/SkShader.h | |
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 'include/core/SkShader.h')
-rw-r--r-- | include/core/SkShader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 6d24c1a73c..0519fe1851 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -17,6 +17,10 @@ #include "SkPaint.h" #include "../gpu/GrColor.h" +#ifdef GOOGLE3 +#include "../private/SkAutoMalloc.h" +#endif + class SkColorFilter; class SkColorSpace; class SkFallbackAlloc; |