Remove SkFallbackAlloc and SkFixedAlloc.
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN;skia.primary:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN
TBR=reed@google.com
Change-Id: I1000dc9ed8ad65b249798759d9af99f47fc237d2
Reviewed-on: https://skia-review.googlesource.com/6809
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index 4d21b19..7f91cbf 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
+#include "SkArenaAlloc.h"
#include "SkBlitter.h"
#include "SkBlendModePriv.h"
#include "SkColor.h"
#include "SkColorFilter.h"
-#include "SkFixedAlloc.h"
#include "SkOpts.h"
#include "SkPM4f.h"
#include "SkPM4fPriv.h"
@@ -27,8 +27,6 @@
: fDst(dst)
, fBlend(blend)
, fPaintColor(paintColor)
- , fScratchAlloc(fScratch, sizeof(fScratch))
- , fScratchFallback(&fScratchAlloc)
{}
void blitH (int x, int y, int w) override;
@@ -64,8 +62,7 @@
// Scratch space for shaders and color filters to use.
char fScratch[64];
- SkFixedAlloc fScratchAlloc;
- SkFallbackAlloc fScratchFallback;
+ SkArenaAlloc fArena{fScratch, sizeof(fScratch), 128};
typedef SkBlitter INHERITED;
};
@@ -116,7 +113,7 @@
bool is_opaque = paintColor->a() == 1.0f,
is_constant = true;
if (shader) {
- if (!shader->appendStages(pipeline, dst.colorSpace(), &blitter->fScratchFallback,
+ if (!shader->appendStages(pipeline, dst.colorSpace(), &blitter->fArena,
ctm, paint)) {
return earlyOut();
}
@@ -132,7 +129,7 @@
}
if (colorFilter) {
- if (!colorFilter->appendStages(pipeline, dst.colorSpace(), &blitter->fScratchFallback,
+ if (!colorFilter->appendStages(pipeline, dst.colorSpace(), &blitter->fArena,
is_opaque)) {
return earlyOut();
}