diff options
| author |  Herb Derby <herb@google.com> | 2017-02-06 15:26:09 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 15:43:45 +0000 |
| commit | 2b57b7f7a7fc97db57f190b5a8ebcf68e177ee2d (patch) | |
| tree | 9b50da8887f7826d7f7f83ecab7f30eaddb7d7cf /gm | |
| parent | e970d5965d041a9f67de7f49a0e27b9f1f6554a6 (diff) | |
Use SkArenaAlloc instead of SkSmallAllocator in the SkAutoBlitterChoose code.
TBR=reed@google.com
Change-Id: Iefb044bf7657fbf982f23aa91a3f4d013ce2c626
Reviewed-on: https://skia-review.googlesource.com/7786
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/SkLinearBitmapPipelineGM.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp index e8816452fe..1bf43013c9 100644 --- a/gm/SkLinearBitmapPipelineGM.cpp +++ b/gm/SkLinearBitmapPipelineGM.cpp @@ -6,6 +6,8 @@ */ #include "gm.h" + +#include "SkArenaAlloc.h" #include "SkBlitter.h" #include "SkCanvas.h" #include "SkColor.h" @@ -59,7 +61,7 @@ static void draw_rect_orig(SkCanvas* canvas, const SkRect& r, SkColor c, const S sk_sp<SkImage> image(SkImage::MakeRasterCopy(SkPixmap(info, pmsrc.addr32(), pmsrc.rowBytes()))); SkPaint paint; - int32_t storage[kSkBlitterContextSize]; + SkArenaAlloc alloc{kSkBlitterContextSize * sizeof(uint32_t)}; sk_sp<SkShader> shader = image->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); @@ -73,9 +75,8 @@ static void draw_rect_orig(SkCanvas* canvas, const SkRect& r, SkColor c, const S const SkShader::ContextRec rec(paint, *mat, nullptr, SkBlitter::PreferredShaderDest(pmsrc.info()), canvas->imageInfo().colorSpace()); - SkASSERT(paint.getShader()->contextSize(rec) <= sizeof(storage)); - SkShader::Context* ctx = paint.getShader()->createContext(rec, storage); + SkShader::Context* ctx = paint.getShader()->makeContext(rec, &alloc); for (int y = 0; y < ir.height(); y++) { ctx->shadeSpan(0, y, pmdst.writable_addr32(0, y), ir.width()); |