| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "platform/graphics/ContiguousContainer.h" | 5 #include "platform/graphics/ContiguousContainer.h" |
| 6 | 6 |
| 7 #include "wtf/Allocator.h" | 7 #include "wtf/Allocator.h" |
| 8 #include "wtf/ContainerAnnotations.h" | 8 #include "wtf/ContainerAnnotations.h" |
| 9 #include "wtf/PassOwnPtr.h" | 9 #include "wtf/PtrUtil.h" |
| 10 #include "wtf/allocator/PartitionAlloc.h" | 10 #include "wtf/allocator/PartitionAlloc.h" |
| 11 #include "wtf/allocator/Partitions.h" | 11 #include "wtf/allocator/Partitions.h" |
| 12 #include <algorithm> | 12 #include <algorithm> |
| 13 #include <memory> |
| 13 | 14 |
| 14 namespace blink { | 15 namespace blink { |
| 15 | 16 |
| 16 // Default number of max-sized elements to allocate space for, if there is no | 17 // Default number of max-sized elements to allocate space for, if there is no |
| 17 // initial buffer. | 18 // initial buffer. |
| 18 static const unsigned kDefaultInitialBufferSize = 32; | 19 static const unsigned kDefaultInitialBufferSize = 32; |
| 19 | 20 |
| 20 class ContiguousContainerBase::Buffer { | 21 class ContiguousContainerBase::Buffer { |
| 21 WTF_MAKE_NONCOPYABLE(Buffer); | 22 WTF_MAKE_NONCOPYABLE(Buffer); |
| 22 USING_FAST_MALLOC(Buffer); | 23 USING_FAST_MALLOC(Buffer); |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 m_elements.swap(other.m_elements); | 168 m_elements.swap(other.m_elements); |
| 168 m_buffers.swap(other.m_buffers); | 169 m_buffers.swap(other.m_buffers); |
| 169 std::swap(m_endIndex, other.m_endIndex); | 170 std::swap(m_endIndex, other.m_endIndex); |
| 170 std::swap(m_maxObjectSize, other.m_maxObjectSize); | 171 std::swap(m_maxObjectSize, other.m_maxObjectSize); |
| 171 } | 172 } |
| 172 | 173 |
| 173 ContiguousContainerBase::Buffer* | 174 ContiguousContainerBase::Buffer* |
| 174 ContiguousContainerBase::allocateNewBufferForNextAllocation(size_t bufferSize, c
onst char* typeName) | 175 ContiguousContainerBase::allocateNewBufferForNextAllocation(size_t bufferSize, c
onst char* typeName) |
| 175 { | 176 { |
| 176 ASSERT(m_buffers.isEmpty() || m_endIndex == m_buffers.size() - 1); | 177 ASSERT(m_buffers.isEmpty() || m_endIndex == m_buffers.size() - 1); |
| 177 OwnPtr<Buffer> newBuffer = adoptPtr(new Buffer(bufferSize, typeName)); | 178 std::unique_ptr<Buffer> newBuffer = wrapUnique(new Buffer(bufferSize, typeNa
me)); |
| 178 Buffer* bufferToReturn = newBuffer.get(); | 179 Buffer* bufferToReturn = newBuffer.get(); |
| 179 m_buffers.append(std::move(newBuffer)); | 180 m_buffers.append(std::move(newBuffer)); |
| 180 m_endIndex = m_buffers.size() - 1; | 181 m_endIndex = m_buffers.size() - 1; |
| 181 return bufferToReturn; | 182 return bufferToReturn; |
| 182 } | 183 } |
| 183 | 184 |
| 184 } // namespace blink | 185 } // namespace blink |
| OLD | NEW |