cc: More consistent reasoning about display list memory usage.

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 102 matching lines @@
     return last_list_->AddElement();
   }
 
   size_t element_size() const { return element_size_; }
   size_t list_count() const { return storage_.size(); }
   size_t size() const { return size_; }
   bool IsEmpty() const { return size() == 0; }
 
   size_t Capacity() const {
     size_t capacity_sum = 0;
-    for (ScopedPtrVector<InnerList>::const_iterator iter = storage_.begin();
-         iter != storage_.end(); ++iter) {
-      capacity_sum += (*iter)->capacity;
-    }
+    for (const auto& inner_list : storage_)
+      capacity_sum += inner_list->capacity;
     return capacity_sum;
   }
 
   void Clear() {
     // Remove all except for the first InnerList.
     DCHECK(!storage_.empty());
     storage_.erase(storage_.begin() + 1, storage_.end());
     last_list_index_ = 0;
     last_list_ = storage_[0];
     last_list_->size = 0;
@@ skipping 281 matching lines @@
 }
 
 bool ListContainerBase::empty() const {
   return data_->IsEmpty();
 }
 
 size_t ListContainerBase::MaxSizeForDerivedClass() const {
   return data_->element_size();
 }
 
+size_t ListContainerBase::GetCapacityInBytes() const {
+  return data_->Capacity() * data_->element_size();
+}
+
 void ListContainerBase::clear() {
   data_->Clear();
 }
 
 size_t ListContainerBase::AvailableSizeWithoutAnotherAllocationForTesting()
     const {
   return data_->NumAvailableElementsInLastList();
 }
 
 // ListContainerBase::Iterator
@@ skipping 71 matching lines @@
 }
 
 ListContainerBase::ConstReverseIterator::~ConstReverseIterator() {
 }
 
 size_t ListContainerBase::ConstReverseIterator::index() const {
   return index_;
 }
 
 }  // namespace cc