Mac Overlays: Allow multiple overlays with sandwich strategy

cc/base/list_container.cc

 // 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.
 
 #include "cc/base/list_container.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "cc/base/scoped_ptr_vector.h"
@@ skipping 153 matching lines @@
       --last_list_index_;
       last_list_ = storage_[last_list_index_];
 
       // If there are now two empty inner lists, free one of them.
       if (last_list_index_ + 2 < storage_.size())
         storage_.pop_back();
     }
     --size_;
   }
 
-  void Erase(PositionInListContainerCharAllocator position) {
-    DCHECK_EQ(this, position.ptr_to_container);
-    storage_[position.vector_index]->Erase(position.item_iterator);
+  void Erase(PositionInListContainerCharAllocator* position) {
+    DCHECK_EQ(this, position->ptr_to_container);
+    InnerList* list = storage_[position->vector_index];
+    char* item_iterator = position->item_iterator;
+    if (item_iterator == list->LastElement())
+      position->Increment();
+    list->Erase(item_iterator);
     // TODO(weiliangc): Free the InnerList if it is empty.
     --size_;
   }
 
   void InsertBefore(ListContainerBase::Iterator* position, size_t count) {
     if (!count)
       return;
 
     // If |position| is End(), then append |count| elements at the end. This
     // will happen to not invalidate any iterators or memory.
@@ skipping 161 matching lines @@
 }
 
 ListContainerBase::~ListContainerBase() {
 }
 
 void ListContainerBase::RemoveLast() {
   data_->RemoveLast();
 }
 
 void ListContainerBase::EraseAndInvalidateAllPointers(
-    ListContainerBase::Iterator position) {
+    ListContainerBase::Iterator* position) {
   data_->Erase(position);
 }
 
 void ListContainerBase::InsertBeforeAndInvalidateAllPointers(
     ListContainerBase::Iterator* position,
     size_t count) {
   data_->InsertBefore(position, count);
 }
 
 ListContainerBase::ConstReverseIterator ListContainerBase::crbegin() const {
@@ skipping 191 matching lines @@
 }
 
 ListContainerBase::ConstReverseIterator::~ConstReverseIterator() {
 }
 
 size_t ListContainerBase::ConstReverseIterator::index() const {
   return index_;
 }
 
 }  // namespace cc