diff options
| -rw-r--r-- | include/private/SkArenaAlloc.h | 11 | ||||
| -rw-r--r-- | src/core/SkArenaAlloc.cpp | 4 | ||||
| -rw-r--r-- | tests/ArenaAllocTest.cpp | 13 |
3 files changed, 1 insertions, 27 deletions
diff --git a/include/private/SkArenaAlloc.h b/include/private/SkArenaAlloc.h index c9e7274e63..b905ee5eff 100644 --- a/include/private/SkArenaAlloc.h +++ b/include/private/SkArenaAlloc.h @@ -8,8 +8,6 @@ #ifndef SkArenaAlloc_DEFINED #define SkArenaAlloc_DEFINED -#include "SkRefCnt.h" -#include "SkTFitsIn.h" #include "SkTypes.h" #include <cstddef> #include <new> @@ -103,15 +101,6 @@ public: return new(objStart) T(std::forward<Args>(args)...); } - template <typename T, typename... Args> - sk_sp<T> makeSkSp(Args&&... args) { - SkASSERT(SkTFitsIn<uint32_t>(sizeof(T))); - - // The arena takes a ref for itself to account for the destructor. The sk_sp count can't - // become zero or the sk_sp will try to call free on the pointer. - return sk_sp<T>(SkRef(this->make<T>(std::forward<Args>(args)...))); - } - template <typename T> T* makeArrayDefault(size_t count) { uint32_t safeCount = SkTo<uint32_t>(count); diff --git a/src/core/SkArenaAlloc.cpp b/src/core/SkArenaAlloc.cpp index 450f0dac6e..ab23f46b06 100644 --- a/src/core/SkArenaAlloc.cpp +++ b/src/core/SkArenaAlloc.cpp @@ -5,10 +5,8 @@ * found in the LICENSE file. */ -#include <algorithm> -#include <cstddef> #include "SkArenaAlloc.h" -#include "SkTypes.h" +#include <algorithm> static char* end_chain(char*) { return nullptr; } diff --git a/tests/ArenaAllocTest.cpp b/tests/ArenaAllocTest.cpp index e4da0b8ad4..adcdb55390 100644 --- a/tests/ArenaAllocTest.cpp +++ b/tests/ArenaAllocTest.cpp @@ -172,17 +172,4 @@ DEF_TEST(ArenaAlloc, r) { REPORTER_ASSERT(r, created == 128); REPORTER_ASSERT(r, destroyed == 128); - { - created = 0; - destroyed = 0; - SkSTArenaAlloc<64> arena; - - sk_sp<FooRefCnt> f = arena.makeSkSp<FooRefCnt>(4, 5.0f); - REPORTER_ASSERT(r, f->x == 4); - REPORTER_ASSERT(r, f->y == 5.0f); - REPORTER_ASSERT(r, created == 1); - REPORTER_ASSERT(r, destroyed == 0); - } - REPORTER_ASSERT(r, created == 1); - REPORTER_ASSERT(r, destroyed == 1); } |