remove use of malloc.h
authormtklein <mtklein@chromium.org>
Tue, 5 Jan 2016 02:50:42 +0000 (18:50 -0800)
committerCommit bot <commit-bot@chromium.org>
Tue, 5 Jan 2016 02:50:42 +0000 (18:50 -0800)
It's non-portable, commented out, and those asserts are not important.
Let's just blow it away.

BUG=skia:4736
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1551673002

Review URL: https://codereview.chromium.org/1551673002

src/core/SkVarAlloc.cpp

index 840cf28..1fbd382 100644 (file)
@@ -7,13 +7,6 @@
 
 #include "SkVarAlloc.h"
 
-// We use non-standard malloc diagnostic methods to make sure our allocations are sized well.
-#if defined(SK_BUILD_FOR_MAC)
-    #include <malloc/malloc.h>
-#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_WIN32)
-    #include <malloc.h>
-#endif
-
 struct SkVarAlloc::Block {
     Block* prev;
     char* data() { return (char*)(this + 1); }
@@ -60,11 +53,4 @@ void SkVarAlloc::makeSpace(size_t bytes) {
     fBlock = Block::Alloc(fBlock, alloc);
     fByte = fBlock->data();
     fRemaining = alloc - sizeof(Block);
-
-#if defined(SK_BUILD_FOR_MAC)
-    SkASSERT(alloc == malloc_good_size(alloc));
-#elif defined(SK_BUILD_FOR_UNIX) && !defined(__UCLIBC__)
-    // TODO(mtklein): tune so we can assert something like this
-    //SkASSERT(alloc == malloc_usable_size(fBlock));
-#endif
 }