diff options
author | 2017-01-11 21:16:11 +0000 | |
---|---|---|
committer | 2017-01-11 21:47:44 +0000 | |
commit | 8d80bb5f20d899fb7da58b0be0c1218db420891a (patch) | |
tree | 6d6df7e6119e33ee698e481a9f750463a3f3e00c /src/core/SkBitmapProcShader.cpp | |
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 'src/core/SkBitmapProcShader.cpp')
-rw-r--r-- | src/core/SkBitmapProcShader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index 11deac4aed..4bb61f14ad 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -171,7 +171,8 @@ public: private: char fStorage[512 + 96]; - SkArenaAlloc fAllocator {fStorage, sizeof(fStorage)}; + SkFixedAlloc fFixedAlloc {fStorage, sizeof(fStorage)}; + SkFallbackAlloc fAllocator {&fFixedAlloc}; SkLinearBitmapPipeline* fShaderPipeline; SkLinearBitmapPipeline* fBlitterPipeline; SkXfermode::D32Proc fSrcModeProc; |