Change SkMemory to the more accurately named SkMalloc.
Change-Id: I6b08a74234b99bac866bad71014b94f7ec2d4bc8
Reviewed-on: https://skia-review.googlesource.com/10188
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/experimental/SkSetPoly3To3.cpp b/experimental/SkSetPoly3To3.cpp
index 0eac861..19adf40 100644
--- a/experimental/SkSetPoly3To3.cpp
+++ b/experimental/SkSetPoly3To3.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
#include "SkMatrix.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
// FIXME: needs to be in a header
bool SkSetPoly3To3(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]);
diff --git a/experimental/SkSetPoly3To3_A.cpp b/experimental/SkSetPoly3To3_A.cpp
index 13026b9..41eb178 100644
--- a/experimental/SkSetPoly3To3_A.cpp
+++ b/experimental/SkSetPoly3To3_A.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
#include "SkMatrix.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
// FIXME: needs to be in a header
bool SkSetPoly3To3_A(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]);
diff --git a/experimental/SkSetPoly3To3_D.cpp b/experimental/SkSetPoly3To3_D.cpp
index 8302d90..18f34c9 100644
--- a/experimental/SkSetPoly3To3_D.cpp
+++ b/experimental/SkSetPoly3To3_D.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
#include "SkMatrix.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
// FIXME: needs to be in a header
bool SkSetPoly3To3_D(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]);
diff --git a/fuzz/Fuzz.h b/fuzz/Fuzz.h
index 599abc0..1a2aa38 100644
--- a/fuzz/Fuzz.h
+++ b/fuzz/Fuzz.h
@@ -10,7 +10,7 @@
#include "SkData.h"
#include "../tools/Registry.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkTypes.h"
#include <cmath>
diff --git a/gn/core.gni b/gn/core.gni
index e03bbb0..083b2f5 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -456,7 +456,7 @@
"$_include/private/SkFixed.h",
"$_include/private/SkFloatBits.h",
"$_include/private/SkFloatingPoint.h",
- "$_include/private/SkMemory.h",
+ "$_include/private/SkMalloc.h",
"$_include/private/SkMessageBus.h",
"$_include/private/SkMiniRecorder.h",
"$_include/private/SkMutex.h",
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 8f32bfb..beb2be5 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -35,8 +35,8 @@
#include <string.h>
// TODO(herb): remove after chromuim skia/ext/SkMemory_new_handler.cpp
-// has been updated to point to private/SkMemory.h
-#include "../private/SkMemory.h"
+// 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
diff --git a/include/private/SkMemory.h b/include/private/SkMalloc.h
similarity index 97%
rename from include/private/SkMemory.h
rename to include/private/SkMalloc.h
index 02ad0ce..58e11f6 100644
--- a/include/private/SkMemory.h
+++ b/include/private/SkMalloc.h
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#ifndef SkMemory_DEFINED
-#define SkMemory_DEFINED
+#ifndef SkMalloc_DEFINED
+#define SkMalloc_DEFINED
#include <cstddef>
#include <cstring>
@@ -81,4 +81,4 @@
return dst;
}
-#endif //SkMemory_DEFINED
+#endif // SkMalloc_DEFINED
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h
index acf69b5..4c58d47 100644
--- a/include/private/SkTDArray.h
+++ b/include/private/SkTDArray.h
@@ -11,7 +11,7 @@
#define SkTDArray_DEFINED
#include "SkTypes.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
template <typename T> class SkTDArray {
public:
diff --git a/include/private/SkTemplates.h b/include/private/SkTemplates.h
index e8dd04e..351fccc 100644
--- a/include/private/SkTemplates.h
+++ b/include/private/SkTemplates.h
@@ -11,7 +11,7 @@
#define SkTemplates_DEFINED
#include "SkMath.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkTLogic.h"
#include "SkTypes.h"
#include <limits.h>
diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h
index 77901a8..8672cd8 100644
--- a/src/core/SkAutoMalloc.h
+++ b/src/core/SkAutoMalloc.h
@@ -9,7 +9,7 @@
#define SkAutoMalloc_DEFINED
#include "SkTypes.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include <memory>
diff --git a/src/core/SkAutoPixmapStorage.h b/src/core/SkAutoPixmapStorage.h
index ef7f23f..66c5655 100644
--- a/src/core/SkAutoPixmapStorage.h
+++ b/src/core/SkAutoPixmapStorage.h
@@ -8,7 +8,7 @@
#ifndef SkAutoPixmapStorage_DEFINED
#define SkAutoPixmapStorage_DEFINED
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkPixmap.h"
class SK_API SkAutoPixmapStorage : public SkPixmap {
diff --git a/src/core/SkCachedData.cpp b/src/core/SkCachedData.cpp
index 5f28c6c..0f3ca64 100644
--- a/src/core/SkCachedData.cpp
+++ b/src/core/SkCachedData.cpp
@@ -7,7 +7,7 @@
#include "SkCachedData.h"
#include "SkDiscardableMemory.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
//#define TRACK_CACHEDDATA_LIFETIME
diff --git a/src/core/SkDeque.cpp b/src/core/SkDeque.cpp
index 6639a77..167ce46 100644
--- a/src/core/SkDeque.cpp
+++ b/src/core/SkDeque.cpp
@@ -6,7 +6,7 @@
*/
#include "SkDeque.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
struct SkDeque::Block {
Block* fNext;
diff --git a/src/core/SkMask.cpp b/src/core/SkMask.cpp
index 25cc651..167d30d 100644
--- a/src/core/SkMask.cpp
+++ b/src/core/SkMask.cpp
@@ -7,7 +7,7 @@
#include "SkMask.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
//#define TRACK_SKMASK_LIFETIME
diff --git a/src/core/SkMetaData.cpp b/src/core/SkMetaData.cpp
index 462325a..d1564e9 100644
--- a/src/core/SkMetaData.cpp
+++ b/src/core/SkMetaData.cpp
@@ -8,7 +8,7 @@
#include "SkMetaData.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkRefCnt.h"
struct PtrPair {
diff --git a/src/core/SkRWBuffer.cpp b/src/core/SkRWBuffer.cpp
index 49967bd..7770b20 100644
--- a/src/core/SkRWBuffer.cpp
+++ b/src/core/SkRWBuffer.cpp
@@ -8,7 +8,7 @@
#include "SkRWBuffer.h"
#include "SkAtomics.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkStream.h"
// Force small chunks to be a page's worth
diff --git a/src/core/SkRect.cpp b/src/core/SkRect.cpp
index d91596d..d868bbb 100644
--- a/src/core/SkRect.cpp
+++ b/src/core/SkRect.cpp
@@ -7,7 +7,7 @@
#include "SkRect.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
void SkIRect::join(int32_t left, int32_t top, int32_t right, int32_t bottom) {
// do nothing if the params are empty
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index 04ec0e2..4ccb68a 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -12,7 +12,7 @@
#include "SkRegion.h"
#include "SkAtomics.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
inline bool SkRegionValueIsSentinel(int32_t value) {
return value == (int32_t)SkRegion::kRunTypeSentinel;
diff --git a/src/core/SkTLList.h b/src/core/SkTLList.h
index c9cb2d3..194879d 100644
--- a/src/core/SkTLList.h
+++ b/src/core/SkTLList.h
@@ -10,7 +10,7 @@
#include "SkTInternalLList.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkTypes.h"
#include <utility>
diff --git a/src/core/SkTSearch.cpp b/src/core/SkTSearch.cpp
index 1744d0a..7081f67 100644
--- a/src/core/SkTSearch.cpp
+++ b/src/core/SkTSearch.cpp
@@ -8,7 +8,7 @@
#include "SkTSearch.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include <ctype.h>
diff --git a/src/core/SkVarAlloc.cpp b/src/core/SkVarAlloc.cpp
index 2877d5b..cfa1188 100644
--- a/src/core/SkVarAlloc.cpp
+++ b/src/core/SkVarAlloc.cpp
@@ -7,7 +7,7 @@
#include "SkVarAlloc.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
struct SkVarAlloc::Block {
Block* prev;
diff --git a/src/effects/gradients/SkGradientBitmapCache.cpp b/src/effects/gradients/SkGradientBitmapCache.cpp
index f6f248e..06b2d8c 100644
--- a/src/effects/gradients/SkGradientBitmapCache.cpp
+++ b/src/effects/gradients/SkGradientBitmapCache.cpp
@@ -8,7 +8,7 @@
#include "SkGradientBitmapCache.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
struct SkGradientBitmapCache::Entry {
Entry* fPrev;
diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp
index 0b956ae..91cecbd 100644
--- a/src/gpu/GrMemoryPool.cpp
+++ b/src/gpu/GrMemoryPool.cpp
@@ -7,7 +7,7 @@
#include "GrMemoryPool.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#ifdef SK_DEBUG
#define VALIDATE this->validate()
diff --git a/src/gpu/GrRectanizer_pow2.h b/src/gpu/GrRectanizer_pow2.h
index b8cc0a1..902895e 100644
--- a/src/gpu/GrRectanizer_pow2.h
+++ b/src/gpu/GrRectanizer_pow2.h
@@ -10,7 +10,7 @@
#include "GrRectanizer.h"
#include "SkMathPriv.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkPoint.h"
// This Rectanizer quantizes the incoming rects to powers of 2. Each power
diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp
index 2cb1b3f..8a6cb52 100644
--- a/src/lazy/SkDiscardableMemoryPool.cpp
+++ b/src/lazy/SkDiscardableMemoryPool.cpp
@@ -8,7 +8,7 @@
#include "SkDiscardableMemory.h"
#include "SkDiscardableMemoryPool.h"
#include "SkImageGenerator.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkMutex.h"
#include "SkOnce.h"
#include "SkTInternalLList.h"
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index af72764..81c26c9 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -9,7 +9,7 @@
#include "SkData.h"
#include "SkDeflate.h"
#include "SkMakeUnique.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "zlib.h"
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index f32f4e3..240f75c 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -18,7 +18,7 @@
#include "SkMask.h"
#include "SkMaskGamma.h"
#include "SkMatrix22.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkMutex.h"
#include "SkOTUtils.h"
#include "SkPath.h"
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 17dac84..a68f791 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -10,7 +10,7 @@
#include "SkFixed.h"
#include "SkFontMgr.h"
#include "SkFontMgr_android_parser.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkOSFile.h"
#include "SkStream.h"
#include "SkTDArray.h"
diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
index a303abb..6c21dec 100644
--- a/src/ports/SkMemory_malloc.cpp
+++ b/src/ports/SkMemory_malloc.cpp
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkTypes.h"
diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp
index d665799..bf5971b 100644
--- a/src/ports/SkMemory_mozalloc.cpp
+++ b/src/ports/SkMemory_mozalloc.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkTypes.h"
#include "mozilla/mozalloc.h"
diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index 541e06b..e66bcb8 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -9,7 +9,7 @@
#if defined(SK_BUILD_FOR_WIN32)
#include "SkLeanWindows.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkOSFile.h"
#include "SkTFitsIn.h"
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp
index db09018..d64316d 100644
--- a/src/utils/SkInterpolator.cpp
+++ b/src/utils/SkInterpolator.cpp
@@ -9,7 +9,7 @@
#include "SkFixed.h"
#include "SkMath.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkTSearch.h"
SkInterpolatorBase::SkInterpolatorBase() {
diff --git a/src/utils/mac/SkStream_mac.cpp b/src/utils/mac/SkStream_mac.cpp
index 06b717b..2c1c1e2 100644
--- a/src/utils/mac/SkStream_mac.cpp
+++ b/src/utils/mac/SkStream_mac.cpp
@@ -10,7 +10,7 @@
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
#include "SkCGUtils.h"
-#include "SkMemory.h"
+#include "SkMalloc.h"
#include "SkStream.h"
// These are used by CGDataProviderCreateWithData