diff options
| author |  Mike Reed <reed@google.com> | 2018-01-04 13:52:07 -0500 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2018-01-04 20:33:06 +0000 |
| commit | 7edde238f741b7954a18797e88dcd04b59d79d2f (patch) | |
| tree | 32a61b6027ef0ca8d7289b9c6dcbf155329a22cb /include/core/SkTypes.h | |
| parent | 02a32b0fa432a720d7b41c263756a7bac53b020b (diff) | |
don't include SkMalloc.h from SkTypes.h
Needed chrome CLs
https://chromium-review.googlesource.com/c/chromium/src/+/850741
https://chromium-review.googlesource.com/c/chromium/src/+/850920
Bug: skia:
Change-Id: Ic568174a56590a65bfa284c59fd104275ee78da9
Reviewed-on: https://skia-review.googlesource.com/90823
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkTypes.h')
| -rw-r--r-- | include/core/SkTypes.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 15a03d8fab..50efbaea0e 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -34,12 +34,6 @@ // IWYU pragma: end_exports #include <string.h> -// TODO(herb): remove after chromuim skia/ext/SkMemory_new_handler.cpp -// has been updated to point to private/SkMalloc.h -#include "../private/SkMalloc.h" - -// enable to test new device-base clipping -//#define SK_USE_DEVICE_CLIPPING /** \file SkTypes.h */ @@ -57,22 +51,6 @@ */ SK_API extern void sk_abort_no_print(void); -/////////////////////////////////////////////////////////////////////////////// - -#ifdef override_GLOBAL_NEW -#include <new> - -inline void* operator new(size_t size) { - return sk_malloc_throw(size); -} - -inline void operator delete(void* p) { - sk_free(p); -} -#endif - -/////////////////////////////////////////////////////////////////////////////// - #define SK_INIT_TO_AVOID_WARNING = 0 #ifndef SkDebugf |