diff options
| author |  Herb Derby <herb@google.com> | 2017-01-11 21:16:11 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 21:47:44 +0000 |
| commit | 8d80bb5f20d899fb7da58b0be0c1218db420891a (patch) | |
| tree | 6d6df7e6119e33ee698e481a9f750463a3f3e00c /gm | |
| parent | d1c8e56423f4d1a879f3a7bcd24e2725d9b690a7 (diff) | |
Revert "Introduce SkArenaAlloc - should be fast for POD types and RAII for types with dtors."
This reverts commit 6ff51aedda6f3b4873c292d7e03e47ad656543f8.
Reason for revert: breaks win2k8 and PDFium
Change-Id: Ib1e2db8e523d5d321836ce00e3773def3db8be2f
Reviewed-on: https://skia-review.googlesource.com/6898
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/SkLinearBitmapPipelineGM.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp index e8816452fe..43e4a247bb 100644 --- a/gm/SkLinearBitmapPipelineGM.cpp +++ b/gm/SkLinearBitmapPipelineGM.cpp @@ -117,7 +117,8 @@ static void draw_rect_fp(SkCanvas* canvas, const SkRect& r, SkColor c, const SkM auto procN = SkXfermode::GetD32Proc(SkBlendMode::kSrcOver, flags); char storage[512]; - SkArenaAlloc allocator{storage, sizeof(storage)}; + SkFixedAlloc fixedAlloc{storage, sizeof(storage)}; + SkFallbackAlloc allocator{&fixedAlloc}; SkLinearBitmapPipeline pipeline{ inv, filterQuality, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, |