diff options
author | Herb Derby <herb@google.com> | 2017-03-27 13:35:15 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-27 18:13:07 +0000 |
commit | b549cc38c8404c58642ada75c0b24907702cc005 (patch) | |
tree | 4d3d04ea34532b9f15a62c46e2ca68e0dccbd520 /src | |
parent | c0b642ca48d58416409e555549434066f09692b7 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkAutoMalloc.h | 2 | ||||
-rw-r--r-- | src/core/SkAutoPixmapStorage.h | 2 | ||||
-rw-r--r-- | src/core/SkCachedData.cpp | 2 | ||||
-rw-r--r-- | src/core/SkDeque.cpp | 2 | ||||
-rw-r--r-- | src/core/SkMask.cpp | 2 | ||||
-rw-r--r-- | src/core/SkMetaData.cpp | 2 | ||||
-rw-r--r-- | src/core/SkRWBuffer.cpp | 2 | ||||
-rw-r--r-- | src/core/SkRect.cpp | 2 | ||||
-rw-r--r-- | src/core/SkRegionPriv.h | 2 | ||||
-rw-r--r-- | src/core/SkTLList.h | 2 | ||||
-rw-r--r-- | src/core/SkTSearch.cpp | 2 | ||||
-rw-r--r-- | src/core/SkVarAlloc.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientBitmapCache.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrMemoryPool.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrRectanizer_pow2.h | 2 | ||||
-rw-r--r-- | src/lazy/SkDiscardableMemoryPool.cpp | 2 | ||||
-rw-r--r-- | src/pdf/SkDeflate.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkFontMgr_android_parser.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkMemory_malloc.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkMemory_mozalloc.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkOSFile_win.cpp | 2 | ||||
-rw-r--r-- | src/utils/SkInterpolator.cpp | 2 | ||||
-rw-r--r-- | src/utils/mac/SkStream_mac.cpp | 2 |
24 files changed, 24 insertions, 24 deletions
diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h index 77901a8380..8672cd86f9 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 ef7f23f28d..66c5655e54 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 5f28c6ce35..0f3ca649aa 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 6639a77dc0..167ce46ccc 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 25cc65187d..167d30d166 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 462325a092..d1564e9fec 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 49967bd271..7770b20769 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 d91596dc07..d868bbb859 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 04ec0e2d47..4ccb68a392 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 c9cb2d3eac..194879d6d1 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 1744d0ad89..7081f672cf 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 2877d5ba9f..cfa1188c62 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 f6f248e9a1..06b2d8c3fe 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 0b956aecf9..91cecbd4c2 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 b8cc0a15b4..902895e820 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 2cb1b3f22b..8a6cb526b3 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 af727640bf..81c26c9196 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 f32f4e3e93..240f75c2e2 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 17dac84ec1..a68f791387 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 a303abb080..6c21decc80 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 d665799bbf..bf5971ba07 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 541e06b513..e66bcb89c0 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 db090184b6..d64316d845 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 06b717b1c8..2c1c1e2e05 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 |