From 980469807d0838ff924843a9efb80a2907dcde87 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 5 Jan 2023 18:42:26 +0000 Subject: [PATCH] Remove use of SkMalloc from Skia Interpolator Change-Id: I91364a0b64c953221e013cd360c797ef0faa6a03 --- libs/hwui/SkiaInterpolator.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/hwui/SkiaInterpolator.cpp b/libs/hwui/SkiaInterpolator.cpp index b28b15aa6cf4d..47bd0b96ebd34 100644 --- a/libs/hwui/SkiaInterpolator.cpp +++ b/libs/hwui/SkiaInterpolator.cpp @@ -20,9 +20,10 @@ #include "include/core/SkScalar.h" #include "include/core/SkTypes.h" #include "include/private/SkFixed.h" -#include "include/private/SkMalloc.h" #include "src/core/SkTSearch.h" +#include + typedef int Dot14; #define Dot14_ONE (1 << 14) #define Dot14_HALF (1 << 13) @@ -96,7 +97,7 @@ SkiaInterpolatorBase::SkiaInterpolatorBase() { SkiaInterpolatorBase::~SkiaInterpolatorBase() { if (fStorage) { - sk_free(fStorage); + free(fStorage); } } @@ -106,7 +107,7 @@ void SkiaInterpolatorBase::reset(int elemCount, int frameCount) { fFrameCount = static_cast(frameCount); fRepeat = SK_Scalar1; if (fStorage) { - sk_free(fStorage); + free(fStorage); fStorage = nullptr; fTimes = nullptr; } @@ -213,7 +214,10 @@ SkiaInterpolator::SkiaInterpolator(int elemCount, int frameCount) { void SkiaInterpolator::reset(int elemCount, int frameCount) { INHERITED::reset(elemCount, frameCount); - fStorage = sk_malloc_throw((sizeof(float) * elemCount + sizeof(SkTimeCode)) * frameCount); + size_t numBytes = (sizeof(float) * elemCount + sizeof(SkTimeCode)) * frameCount; + fStorage = malloc(numBytes); + LOG_ALWAYS_FATAL_IF(!fStorage, "Failed to allocate %zu bytes in %s", + numBytes, __func__); fTimes = (SkTimeCode*)fStorage; fValues = (float*)((char*)fStorage + sizeof(SkTimeCode) * frameCount); }