diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkBitmapController.cpp | 10 | ||||
-rw-r--r-- | src/core/SkBitmapController.h | 10 | ||||
-rw-r--r-- | src/core/SkBitmapProcState.cpp | 8 | ||||
-rw-r--r-- | src/core/SkBitmapProcState.h | 3 |
4 files changed, 13 insertions, 18 deletions
diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp index 005c5a559f..ed16f9bc21 100644 --- a/src/core/SkBitmapController.cpp +++ b/src/core/SkBitmapController.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkArenaAlloc.h" #include "SkBitmap.h" #include "SkBitmapCache.h" #include "SkBitmapController.h" @@ -18,11 +19,10 @@ SkBitmapController::State* SkBitmapController::requestBitmap(const SkBitmapProvider& provider, const SkMatrix& inv, SkFilterQuality quality, - void* storage, size_t storageSize) { - State* state = this->onRequestBitmap(provider, inv, quality, storage, storageSize); + SkArenaAlloc* alloc) { + State* state = this->onRequestBitmap(provider, inv, quality, alloc); if (state) { if (nullptr == state->fPixmap.addr()) { - SkInPlaceDeleteCheck(state, storage); state = nullptr; } } @@ -146,6 +146,6 @@ SkDefaultBitmapControllerState::SkDefaultBitmapControllerState(const SkBitmapPro SkBitmapController::State* SkDefaultBitmapController::onRequestBitmap(const SkBitmapProvider& bm, const SkMatrix& inverse, SkFilterQuality quality, - void* storage, size_t size) { - return SkInPlaceNewCheck<SkDefaultBitmapControllerState>(storage, size, bm, inverse, quality); + SkArenaAlloc* alloc) { + return alloc->make<SkDefaultBitmapControllerState>(bm, inverse, quality); } diff --git a/src/core/SkBitmapController.h b/src/core/SkBitmapController.h index 9eff2d28ff..394a7cfd1a 100644 --- a/src/core/SkBitmapController.h +++ b/src/core/SkBitmapController.h @@ -40,15 +40,11 @@ public: virtual ~SkBitmapController() {} State* requestBitmap(const SkBitmapProvider&, const SkMatrix& inverse, SkFilterQuality, - void* storage, size_t storageSize); - - State* requestBitmap(const SkBitmapProvider& bp, const SkMatrix& inv, SkFilterQuality quality) { - return this->requestBitmap(bp, inv, quality, nullptr, 0); - } + SkArenaAlloc*); protected: virtual State* onRequestBitmap(const SkBitmapProvider&, const SkMatrix& inv, SkFilterQuality, - void* storage, size_t storageSize) = 0; + SkArenaAlloc*) = 0; }; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -61,7 +57,7 @@ public: protected: State* onRequestBitmap(const SkBitmapProvider&, const SkMatrix& inverse, SkFilterQuality, - void* storage, size_t storageSize) override; + SkArenaAlloc*) override; }; #endif diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 105637176a..8fea0a3b6e 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -37,9 +37,7 @@ SkBitmapProcInfo::SkBitmapProcInfo(const SkBitmapProvider& provider, , fBMState(nullptr) {} -SkBitmapProcInfo::~SkBitmapProcInfo() { - SkInPlaceDeleteCheck(fBMState, fBMStateStorage.get()); -} +SkBitmapProcInfo::~SkBitmapProcInfo() {} /////////////////////////////////////////////////////////////////////////////// @@ -87,8 +85,8 @@ bool SkBitmapProcInfo::init(const SkMatrix& inv, const SkPaint& paint) { fFilterQuality = paint.getFilterQuality(); SkDefaultBitmapController controller; - fBMState = controller.requestBitmap(fProvider, inv, paint.getFilterQuality(), - fBMStateStorage.get(), fBMStateStorage.size()); + fBMState = controller.requestBitmap(fProvider, inv, paint.getFilterQuality(), &fAlloc); + // Note : we allow the controller to return an empty (zero-dimension) result. Should we? if (nullptr == fBMState || fBMState->pixmap().info().isEmpty()) { return false; diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h index 46e418cc02..7d16ba6686 100644 --- a/src/core/SkBitmapProcState.h +++ b/src/core/SkBitmapProcState.h @@ -8,6 +8,7 @@ #ifndef SkBitmapProcState_DEFINED #define SkBitmapProcState_DEFINED +#include "SkArenaAlloc.h" #include "SkBitmap.h" #include "SkBitmapController.h" #include "SkBitmapProvider.h" @@ -49,7 +50,7 @@ private: enum { kBMStateSize = 136 // found by inspection. if too small, we will call new/delete }; - SkAlignedSStorage<kBMStateSize> fBMStateStorage; + SkSTArenaAlloc<kBMStateSize> fAlloc; SkBitmapController::State* fBMState; }; |