diff options
| author |  Herb Derby <herb@google.com> | 2017-01-13 17:34:33 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-16 17:01:57 +0000 |
| commit | ac04fef619ad3939a25e66bdaef6f6b1e7f5ca50 (patch) | |
| tree | d30efcbac91ac1a4b434d910a64487e70efbde0d /gn | |
| parent | 26e73c057755df4fbffeee372be98e430867034d (diff) | |
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>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 4 | ||||
| -rw-r--r-- | gn/tests.gni | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gn/core.gni b/gn/core.gni index e5d72b33fc..432526364e 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -130,8 +130,8 @@ skia_core_sources = [ "$_src/core/SkFilterProc.cpp", "$_src/core/SkFilterProc.h", "$_src/core/SkFindAndPlaceGlyph.h", - "$_src/core/SkFixedAlloc.cpp", - "$_src/core/SkFixedAlloc.h", + "$_src/core/SkArenaAlloc.cpp", + "$_src/core/SkArenaAlloc.h", "$_src/core/SkFlattenable.cpp", "$_src/core/SkFlattenableSerialization.cpp", "$_src/core/SkFont.cpp", diff --git a/gn/tests.gni b/gn/tests.gni index caafae456a..483f574ed6 100644 --- a/gn/tests.gni +++ b/gn/tests.gni @@ -10,6 +10,7 @@ tests_sources = [ "$_tests/AAClipTest.cpp", "$_tests/AnnotationTest.cpp", "$_tests/ApplyGammaTest.cpp", + "$_tests/ArenaAllocTest.cpp", "$_tests/AsADashTest.cpp", "$_tests/BadIcoTest.cpp", "$_tests/BitmapCopyTest.cpp", @@ -62,7 +63,6 @@ tests_sources = [ "$_tests/ExifTest.cpp", "$_tests/FillPathTest.cpp", "$_tests/FitsInTest.cpp", - "$_tests/FixedAllocTest.cpp", "$_tests/FlattenableCustomFactory.cpp", "$_tests/FlattenableFactoryToName.cpp", "$_tests/FlattenDrawableTest.cpp", |