diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-07 17:28:15 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:28:21 +0000 |
| commit | dd8b72ae7319598cfc1024901e860c52f06e6ae1 (patch) | |
| tree | b6e94e11c082c691512f8989ae55794fa2e6b756 /gm | |
| parent | 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 (diff) | |
Revert "Use SkArenaAlloc instead of SkSmallAllocator in the SkAutoBlitterChoose code."
This reverts commit 2b57b7f7a7fc97db57f190b5a8ebcf68e177ee2d.
Reason for revert: Android compile failing
Original change's description:
> 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>
>
TBR=mtklein@chromium.org,mtklein@google.com,herb@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Id09c35377dddae0811d998b7d0c34c422325a5bc
Reviewed-on: https://skia-review.googlesource.com/8129
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/SkLinearBitmapPipelineGM.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp index 1bf43013c9..e8816452fe 100644 --- a/gm/SkLinearBitmapPipelineGM.cpp +++ b/gm/SkLinearBitmapPipelineGM.cpp @@ -6,8 +6,6 @@ */ #include "gm.h" - -#include "SkArenaAlloc.h" #include "SkBlitter.h" #include "SkCanvas.h" #include "SkColor.h" @@ -61,7 +59,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; - SkArenaAlloc alloc{kSkBlitterContextSize * sizeof(uint32_t)}; + int32_t storage[kSkBlitterContextSize]; sk_sp<SkShader> shader = image->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); @@ -75,8 +73,9 @@ 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()->makeContext(rec, &alloc); + SkShader::Context* ctx = paint.getShader()->createContext(rec, storage); for (int y = 0; y < ir.height(); y++) { ctx->shadeSpan(0, y, pmdst.writable_addr32(0, y), ir.width()); |