Mac Overlays: Allow multiple overlays with sandwich strategy

cc/base/list_container.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_BASE_LIST_CONTAINER_H_
 #define CC_BASE_LIST_CONTAINER_H_
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 126 matching lines @@
    protected:
     // This is used to track how many increment has happened since rbegin(). It
     // is used to avoid double increment at places an index reference is
     // needed. For reverse iterator this means rbegin() corresponds to index 0
     // and rend() corresponds to index |size|.
     size_t index_;
   };
 
   // Unlike the ListContainer methods, these do not invoke element destructors.
   void RemoveLast();
-  void EraseAndInvalidateAllPointers(Iterator position);
+  void EraseAndInvalidateAllPointers(Iterator* position);
   void InsertBeforeAndInvalidateAllPointers(Iterator* position,
                                             size_t number_of_elements);
 
   ConstReverseIterator crbegin() const;
   ConstReverseIterator crend() const;
   ReverseIterator rbegin();
   ReverseIterator rend();
   ConstIterator cbegin() const;
   ConstIterator cend() const;
   Iterator begin();
@@ skipping 61 matching lines @@
   // Removes the last element of the list and makes its space available for
   // allocation.
   void RemoveLast() {
     DCHECK(!empty());
     back()->~BaseElementType();
     ListContainerBase::RemoveLast();
   }
 
   // When called, all raw pointers that have been handed out are no longer
   // valid. Use with caution.
   // This function does not deallocate memory.

[ccameron, 2015/09/02 21:41:55]

I'd pass position by pointer here (to match InsertBefore's behavior below).

[Andre, 2015/09/02 21:54:51]

Hmm, but ListContainer::InsertBefore below returns an Iterator just like this.
The one that takes a pointer is ListContainerBase::InsertBefore, and I followed
that style with ListContainerBase::Erase.

[Andre, 2015/09/02 22:08:52]

Also, making it take a pointer would make code like this awkward:
https://code.google.com/p/chromium/codesearch#chromium/src/cc/base/list_conta...

[ccameron, 2015/09/02 22:22:33]

Yes, you're right, that was a bad suggestion.

Maybe add to the comment saying that the returned iterator is the element after
|position|.

[Andre, 2015/09/03 22:45:59]

Done. This was split off into another CL.

-  void EraseAndInvalidateAllPointers(Iterator position) {
+  Iterator EraseAndInvalidateAllPointers(Iterator position) {
     BaseElementType* item = *position;
     item->~BaseElementType();
-    ListContainerBase::EraseAndInvalidateAllPointers(position);
+    ListContainerBase::EraseAndInvalidateAllPointers(&position);
+    return position;
   }
 
   ConstReverseIterator crbegin() const {
     return ConstReverseIterator(ListContainerBase::crbegin());
   }
   ConstReverseIterator crend() const {
     return ConstReverseIterator(ListContainerBase::crend());
   }
   ConstReverseIterator rbegin() const { return crbegin(); }
   ConstReverseIterator rend() const { return crend(); }
@@ skipping 246 matching lines @@
         ListContainerBase::ConstReverseIterator base_iterator)
         : ListContainerBase::ConstReverseIterator(base_iterator) {}
     friend ConstReverseIterator ListContainer<BaseElementType>::crbegin() const;
     friend ConstReverseIterator ListContainer<BaseElementType>::crend() const;
   };
 };
 
 }  // namespace cc
 
 #endif  // CC_BASE_LIST_CONTAINER_H_