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/PtrUtil.h" | 9 #include "wtf/PassOwnPtr.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> | |
14 | 13 |
15 namespace blink { | 14 namespace blink { |
16 | 15 |
17 // Default number of max-sized elements to allocate space for, if there is no | 16 // Default number of max-sized elements to allocate space for, if there is no |
18 // initial buffer. | 17 // initial buffer. |
19 static const unsigned kDefaultInitialBufferSize = 32; | 18 static const unsigned kDefaultInitialBufferSize = 32; |
20 | 19 |
21 class ContiguousContainerBase::Buffer { | 20 class ContiguousContainerBase::Buffer { |
22 WTF_MAKE_NONCOPYABLE(Buffer); | 21 WTF_MAKE_NONCOPYABLE(Buffer); |
23 USING_FAST_MALLOC(Buffer); | 22 USING_FAST_MALLOC(Buffer); |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 m_elements.swap(other.m_elements); | 167 m_elements.swap(other.m_elements); |
169 m_buffers.swap(other.m_buffers); | 168 m_buffers.swap(other.m_buffers); |
170 std::swap(m_endIndex, other.m_endIndex); | 169 std::swap(m_endIndex, other.m_endIndex); |
171 std::swap(m_maxObjectSize, other.m_maxObjectSize); | 170 std::swap(m_maxObjectSize, other.m_maxObjectSize); |
172 } | 171 } |
173 | 172 |
174 ContiguousContainerBase::Buffer* | 173 ContiguousContainerBase::Buffer* |
175 ContiguousContainerBase::allocateNewBufferForNextAllocation(size_t bufferSize, c
onst char* typeName) | 174 ContiguousContainerBase::allocateNewBufferForNextAllocation(size_t bufferSize, c
onst char* typeName) |
176 { | 175 { |
177 ASSERT(m_buffers.isEmpty() || m_endIndex == m_buffers.size() - 1); | 176 ASSERT(m_buffers.isEmpty() || m_endIndex == m_buffers.size() - 1); |
178 std::unique_ptr<Buffer> newBuffer = wrapUnique(new Buffer(bufferSize, typeNa
me)); | 177 OwnPtr<Buffer> newBuffer = adoptPtr(new Buffer(bufferSize, typeName)); |
179 Buffer* bufferToReturn = newBuffer.get(); | 178 Buffer* bufferToReturn = newBuffer.get(); |
180 m_buffers.append(std::move(newBuffer)); | 179 m_buffers.append(std::move(newBuffer)); |
181 m_endIndex = m_buffers.size() - 1; | 180 m_endIndex = m_buffers.size() - 1; |
182 return bufferToReturn; | 181 return bufferToReturn; |
183 } | 182 } |
184 | 183 |
185 } // namespace blink | 184 } // namespace blink |
OLD | NEW |