plumb through arenaalloc

- simplifies the older pattern of storage/size
- removes a dynamic allocation in defaultbitmapcontroller

Bug: skia:
Change-Id: Ibc937d3e0c057e78cc0c8bf7d9ad2d824eb240d9
Reviewed-on: https://skia-review.googlesource.com/141321
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 5 insertions, 5 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);
 }