Adjust heap profiler integration for ContiguousContainer.

third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

 // Copyright 2015 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 "platform/graphics/ContiguousContainer.h"
 
 #include "wtf/Allocator.h"
 #include "wtf/ContainerAnnotations.h"
 #include "wtf/PartitionAlloc.h"
 #include "wtf/Partitions.h"
 #include "wtf/PassOwnPtr.h"
 #include <algorithm>
 
 namespace blink {
 
 // Default number of max-sized elements to allocate space for, if there is no
 // initial buffer.
 static const unsigned kDefaultInitialBufferSize = 32;
 
 class ContiguousContainerBase::Buffer {
     WTF_MAKE_NONCOPYABLE(Buffer);
     USING_FAST_MALLOC(Buffer);
 public:
-    explicit Buffer(size_t bufferSize, const char* typeName)
+    Buffer(size_t bufferSize, const char* typeName)
     {
         m_capacity = WTF::Partitions::bufferActualSize(bufferSize);
         m_begin = m_end = static_cast<char*>(
             WTF::Partitions::bufferMalloc(m_capacity, typeName));
         ANNOTATE_NEW_BUFFER(m_begin, m_capacity, 0);
     }
 
     ~Buffer()
     {
         ANNOTATE_DELETE_BUFFER(m_begin, m_capacity, usedCapacity());
@@ skipping 23 matching lines @@
         m_end = static_cast<char*>(object);
     }
 
 private:
     // m_begin <= m_end <= m_begin + m_capacity
     char* m_begin;
     char* m_end;
     size_t m_capacity;
 };
 
-ContiguousContainerBase::ContiguousContainerBase(size_t maxObjectSize, const char* typeName)
+ContiguousContainerBase::ContiguousContainerBase(size_t maxObjectSize)
     : m_endIndex(0)
     , m_maxObjectSize(maxObjectSize)
 {
 }
 
-ContiguousContainerBase::ContiguousContainerBase(
-    size_t maxObjectSize, size_t initialSizeBytes, const char* typeName)
-    : ContiguousContainerBase(maxObjectSize, typeName)
-{
-    allocateNewBufferForNextAllocation(std::max(maxObjectSize, initialSizeBytes), typeName);
-}
-
 ContiguousContainerBase::~ContiguousContainerBase()
 {
 }
 
 size_t ContiguousContainerBase::capacityInBytes() const
 {
     size_t capacity = 0;
     for (const auto& buffer : m_buffers)
         capacity += buffer->capacity();
     return capacity;
 }
 
 size_t ContiguousContainerBase::usedCapacityInBytes() const
 {
     size_t usedCapacity = 0;
     for (const auto& buffer : m_buffers)
         usedCapacity += buffer->usedCapacity();
     return usedCapacity;
 }
 
 size_t ContiguousContainerBase::memoryUsageInBytes() const
 {
     return sizeof(*this) + capacityInBytes()
         + m_elements.capacity() * sizeof(m_elements[0]);
 }
 
+void ContiguousContainerBase::reserveInitialCapacity(size_t bufferSize, const char* typeName)
+{
+    allocateNewBufferForNextAllocation(bufferSize, typeName);
+}
+
 void* ContiguousContainerBase::allocate(size_t objectSize, const char* typeName)
 {
     ASSERT(objectSize <= m_maxObjectSize);
 
     Buffer* bufferForAlloc = nullptr;
     if (!m_buffers.isEmpty()) {
         Buffer* endBuffer = m_buffers[m_endIndex].get();
         if (endBuffer->unusedCapacity() >= objectSize)
             bufferForAlloc = endBuffer;
         else if (m_endIndex + 1 < m_buffers.size())
@@ skipping 48 matching lines @@
 {
     ASSERT(m_buffers.isEmpty() || m_endIndex == m_buffers.size() - 1);
     OwnPtr<Buffer> newBuffer = adoptPtr(new Buffer(bufferSize, typeName));
     Buffer* bufferToReturn = newBuffer.get();
     m_buffers.append(newBuffer.release());
     m_endIndex = m_buffers.size() - 1;
     return bufferToReturn;
 }
 
 } // namespace blink