Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Side by Side Diff: third_party/WebKit/Source/wtf/TerminatedArrayBuilder.h

Issue 1650123002: Keep (Heap)TerminatedArray in a consistent state while building. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add assert Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/heap/HeapTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef TerminatedArrayBuilder_h 4 #ifndef TerminatedArrayBuilder_h
5 #define TerminatedArrayBuilder_h 5 #define TerminatedArrayBuilder_h
6 6
7 #include "wtf/OwnPtr.h" 7 #include "wtf/OwnPtr.h"
8 8
9 namespace WTF { 9 namespace WTF {
10 10
11 template<typename T, template <typename> class ArrayType = TerminatedArray> 11 template<typename T, template <typename> class ArrayType = TerminatedArray>
12 class TerminatedArrayBuilder { 12 class TerminatedArrayBuilder {
13 DISALLOW_NEW(); 13 DISALLOW_NEW();
14 WTF_MAKE_NONCOPYABLE(TerminatedArrayBuilder); 14 WTF_MAKE_NONCOPYABLE(TerminatedArrayBuilder);
15 public: 15 public:
16 explicit TerminatedArrayBuilder(typename ArrayType<T>::Allocator::PassPtr ar ray) 16 explicit TerminatedArrayBuilder(typename ArrayType<T>::Allocator::PassPtr ar ray)
17 : m_array(array) 17 : m_array(array)
18 , m_count(0) 18 , m_count(0)
19 , m_capacity(0) 19 , m_capacity(0)
20 { 20 {
21 if (!m_array) 21 if (!m_array)
22 return; 22 return;
23 m_capacity = m_count = m_array->size(); 23 m_capacity = m_count = m_array->size();
24 ASSERT(m_array->at(m_count - 1).isLastInArray());
24 } 25 }
25 26
26 void grow(size_t count) 27 void grow(size_t count)
27 { 28 {
28 ASSERT(count); 29 ASSERT(count);
29 if (!m_array) { 30 if (!m_array) {
30 ASSERT(!m_count); 31 ASSERT(!m_count);
31 ASSERT(!m_capacity); 32 ASSERT(!m_capacity);
32 m_capacity = count; 33 m_capacity = count;
33 m_array = ArrayType<T>::Allocator::create(m_capacity); 34 m_array = ArrayType<T>::Allocator::create(m_capacity);
34 return; 35 } else {
36 ASSERT(m_array->at(m_count - 1).isLastInArray());
37 m_capacity += count;
38 m_array = ArrayType<T>::Allocator::resize(m_array.release(), m_capac ity);
39 m_array->at(m_count - 1).setLastInArray(false);
35 } 40 }
36 m_capacity += count; 41 m_array->at(m_capacity - 1).setLastInArray(true);
37 m_array = ArrayType<T>::Allocator::resize(m_array.release(), m_capacity) ;
38 m_array->at(m_count - 1).setLastInArray(false);
39 } 42 }
40 43
41 void append(const T& item) 44 void append(const T& item)
42 { 45 {
43 RELEASE_ASSERT(m_count < m_capacity); 46 RELEASE_ASSERT(m_count < m_capacity);
44 ASSERT(!item.isLastInArray()); 47 ASSERT(!item.isLastInArray());
45 m_array->at(m_count++) = item; 48 m_array->at(m_count++) = item;
49 if (m_count == m_capacity)
50 m_array->at(m_capacity - 1).setLastInArray(true);
46 } 51 }
47 52
48 typename ArrayType<T>::Allocator::PassPtr release() 53 typename ArrayType<T>::Allocator::PassPtr release()
49 { 54 {
50 RELEASE_ASSERT(m_count == m_capacity); 55 RELEASE_ASSERT(m_count == m_capacity);
51 if (m_array)
52 m_array->at(m_count - 1).setLastInArray(true);
53 assertValid(); 56 assertValid();
54 return m_array.release(); 57 return m_array.release();
55 } 58 }
56 59
57 private: 60 private:
58 #if ENABLE(ASSERT) 61 #if ENABLE(ASSERT)
59 void assertValid() 62 void assertValid()
60 { 63 {
61 for (size_t i = 0; i < m_count; ++i) { 64 for (size_t i = 0; i < m_count; ++i) {
62 bool isLastInArray = (i + 1 == m_count); 65 bool isLastInArray = (i + 1 == m_count);
63 ASSERT(m_array->at(i).isLastInArray() == isLastInArray); 66 ASSERT(m_array->at(i).isLastInArray() == isLastInArray);
64 } 67 }
65 } 68 }
66 #else 69 #else
67 void assertValid() { } 70 void assertValid() { }
68 #endif 71 #endif
69 72
70 typename ArrayType<T>::Allocator::Ptr m_array; 73 typename ArrayType<T>::Allocator::Ptr m_array;
71 size_t m_count; 74 size_t m_count;
72 size_t m_capacity; 75 size_t m_capacity;
73 }; 76 };
74 77
75 } // namespace WTF 78 } // namespace WTF
76 79
77 using WTF::TerminatedArrayBuilder; 80 using WTF::TerminatedArrayBuilder;
78 81
79 #endif // TerminatedArrayBuilder_h 82 #endif // TerminatedArrayBuilder_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/HeapTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698