Revert "Fix reset and deleting behavior."

This reverts commit 412a86d014783be99a7a9a0fae407791b95806e8.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Fix reset and deleting behavior.
> 
> * Reset the Arena state.
> * Call all the dtors before deleting the blocks.
> 
> TBR=mtklein@google.com
> 
> Change-Id: Iac320fec16e572cc9a6184c1f580089ab720f036
> Reviewed-on: https://skia-review.googlesource.com/7221
> Reviewed-by: Herb Derby <herb@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
> 

TBR=herb@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I4f4d34e0190a60d418f11326a9a9688d7487b8d8
Reviewed-on: https://skia-review.googlesource.com/7261
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

1 files changed, 1 insertions, 47 deletions

diff --git a/tests/ArenaAllocTest.cpp b/tests/ArenaAllocTest.cpp
index 0836b0c49f..647ea25283 100644
--- a/tests/ArenaAllocTest.cpp
+++ b/tests/ArenaAllocTest.cpp
@@ -26,26 +26,6 @@ namespace {
         uint32_t array[128];
     };
 
-    struct Node {
-        Node(Node* n) : next(n) { created++; }
-        ~Node() {
-            destroyed++;
-            if (next) {
-                next->~Node();
-            }
-        }
-        Node *next;
-    };
-
-    struct Start {
-        ~Start() {
-            if (start) {
-                start->~Node();
-            }
-        }
-        Node* start;
-    };
-
 }
 
 struct WithDtor {
@@ -83,7 +63,7 @@ DEF_TEST(ArenaAlloc, r) {
     {
         created = 0;
         destroyed = 0;
-        char block[64];
+        char block[1024];
         SkArenaAlloc arena{block};
 
         REPORTER_ASSERT(r, *arena.make<int>(3) == 3);
@@ -133,30 +113,4 @@ DEF_TEST(ArenaAlloc, r) {
     }
     REPORTER_ASSERT(r, created == 11);
     REPORTER_ASSERT(r, destroyed == 11);
-
-    {
-        char storage[64];
-        SkArenaAlloc arena{storage};
-        arena.makeArrayDefault<char>(256);
-        arena.reset();
-        arena.reset();
-    }
-
-    {
-        created = 0;
-        destroyed = 0;
-        char storage[64];
-        SkArenaAlloc arena{storage};
-
-        Start start;
-        Node* current = nullptr;
-        for (int i = 0; i < 128; i++) {
-            uint64_t* temp = arena.makeArrayDefault<uint64_t>(sizeof(Node) / sizeof(Node*));
-            current = new (temp)Node(current);
-        }
-        start.start = current;
-    }
-
-    REPORTER_ASSERT(r, created == 128);
-    REPORTER_ASSERT(r, destroyed == 128);
 }