simplify insertion methods for SkTLList

tests/LListTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRandom.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
@@ skipping 134 matching lines @@
         REPORTER_ASSERT(reporter, iter1.get()->fID == iter2.get()->fID);
         iter3.init(list2, Iter::kHead_IterStart);
         iter4.init(list2, Iter::kTail_IterStart);
         REPORTER_ASSERT(reporter, iter3.get()->fID == iter1.get()->fID);
         REPORTER_ASSERT(reporter, iter4.get()->fID == iter1.get()->fID);
         REPORTER_ASSERT(reporter, list1 == list2);
 
         list2.reset();
 
         // use both before/after in-place construction on an empty list
-        SkNEW_INSERT_IN_LLIST_BEFORE(&list2, list2.headIter(), ListElement, (1));
+        list2.addBefore(list2.headIter(), 1);
         REPORTER_ASSERT(reporter, list2 == list1);
         list2.reset();
 
-        SkNEW_INSERT_IN_LLIST_AFTER(&list2, list2.tailIter(), ListElement, (1));
+        list2.addAfter(list2.tailIter(), 1);
         REPORTER_ASSERT(reporter, list2 == list1);
 
         // add an element to the second list, check that iters are still valid
         iter3.init(list2, Iter::kHead_IterStart);
         iter4.init(list2, Iter::kTail_IterStart);
         list2.addToHead(ListElement(2));
 
         REPORTER_ASSERT(reporter, iter3.get()->fID == iter1.get()->fID);
         REPORTER_ASSERT(reporter, iter4.get()->fID == iter1.get()->fID);
         REPORTER_ASSERT(reporter, 1 == Iter(list2, Iter::kTail_IterStart).get()->fID);
@@ skipping 33 matching lines @@
                         }
                         Iter prev(iter);
                         Iter next(iter);
                         next.next();
                         prev.prev();
 
                         SkASSERT(iter.get());
                         // insert either before or after the iterator, then check that the
                         // surrounding sequence is correct.
                         if (2 == insertionMethod) {
-                            SkNEW_INSERT_IN_LLIST_BEFORE(&list1, iter, ListElement, (id));
+                            list1.addBefore(iter, id);
                             Iter newItem(iter);
                             newItem.prev();
                             REPORTER_ASSERT(reporter, newItem.get()->fID == id);
 
                             if (next.get()) {
                                 REPORTER_ASSERT(reporter, next.prev()->fID == iter.get()->fID);
                             }
                             if (prev.get()) {
                                 REPORTER_ASSERT(reporter, prev.next()->fID == id);
                             }
                         } else {
-                            SkNEW_INSERT_IN_LLIST_AFTER(&list1, iter, ListElement, (id));
+                            list1.addAfter(iter, id);
                             Iter newItem(iter);
                             newItem.next();
                             REPORTER_ASSERT(reporter, newItem.get()->fID == id);
 
                             if (next.get()) {
                                 REPORTER_ASSERT(reporter, next.prev()->fID == id);
                             }
                             if (prev.get()) {
                                 REPORTER_ASSERT(reporter, prev.next()->fID == iter.get()->fID);
                             }
@@ skipping 43 matching lines @@
             REPORTER_ASSERT(reporter, count == list1.count());
         }
         list1.reset();
     }
 }
 
 DEF_TEST(LList, reporter) {
     TestTInternalLList(reporter);
     TestTLList(reporter);
 }