diff options
author | 2017-01-12 13:47:57 -0500 | |
---|---|---|
committer | 2017-01-12 19:49:46 +0000 | |
commit | 5aedd6d5a31973dcfc8ecb9f995ac0e8d9840163 (patch) | |
tree | 0efc82a25a1ceeb2980ef55e0ecb912a2145d29d | |
parent | 444c1bd38a99872e977efd30277b59f5402f7087 (diff) |
cleanup after 95e3c05
Change-Id: Ifd194fd009196b8bee2dd83328bbe698586d72f4
Reviewed-on: https://skia-review.googlesource.com/6965
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
-rw-r--r-- | include/core/SkShader.h | 4 | ||||
-rw-r--r-- | src/core/SkAutoMalloc.h (renamed from include/private/SkAutoMalloc.h) | 0 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 0519fe1851..6d24c1a73c 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -17,10 +17,6 @@ #include "SkPaint.h" #include "../gpu/GrColor.h" -#ifdef GOOGLE3 -#include "../private/SkAutoMalloc.h" -#endif - class SkColorFilter; class SkColorSpace; class SkFallbackAlloc; diff --git a/include/private/SkAutoMalloc.h b/src/core/SkAutoMalloc.h index 7be882547d..7be882547d 100644 --- a/include/private/SkAutoMalloc.h +++ b/src/core/SkAutoMalloc.h |