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

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

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+more tweaks Created 5 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 WTF_MAKE_NONCOPYABLE(ArrayBufferBuilder); 46 WTF_MAKE_NONCOPYABLE(ArrayBufferBuilder);
47 47
48 public: 48 public:
49 // Creates an ArrayBufferBuilder using the default capacity. 49 // Creates an ArrayBufferBuilder using the default capacity.
50 ArrayBufferBuilder(); 50 ArrayBufferBuilder();
51 51
52 ArrayBufferBuilder(unsigned capacity) 52 ArrayBufferBuilder(unsigned capacity)
53 : m_bytesUsed(0) 53 : m_bytesUsed(0)
54 , m_variableCapacity(true) 54 , m_variableCapacity(true)
55 { 55 {
56 m_buffer = ArrayBuffer::create(capacity, 1); 56 m_buffer = ArrayBuffer::createOrNull(capacity, 1);
57 } 57 }
58 58
59 bool isValid() const 59 bool isValid() const
60 { 60 {
61 return m_buffer; 61 return m_buffer;
62 } 62 }
63 63
64 // Appending empty data is not allowed. 64 // Appending empty data is not allowed.
65 unsigned append(const char* data, unsigned length); 65 unsigned append(const char* data, unsigned length);
66 66
67 // Returns the accumulated data as an ArrayBuffer instance. If needed, 67 // Returns the accumulated data as an ArrayBuffer instance. If needed,
68 // creates a new ArrayBuffer instance and copies contents from the internal 68 // creates a new ArrayBuffer instance and copies contents from the internal
69 // buffer to it. Otherwise, returns a PassRefPtr pointing to the internal 69 // buffer to it. Otherwise, returns a PassRefPtr pointing to the internal
70 // buffer. 70 // buffer.
71 PassRefPtr<ArrayBuffer> toArrayBuffer(); 71 PassRefPtr<ArrayBuffer> toArrayBuffer();
72 72
73 // Converts the accumulated data into a String using the default encoding. 73 // Converts the accumulated data into a String using the default encoding.
74 String toString(); 74 String toString();
75 75
76 // Number of bytes currently accumulated. 76 // Number of bytes currently accumulated.
77 unsigned byteLength() const 77 unsigned byteLength() const
78 { 78 {
79 return m_bytesUsed; 79 return m_bytesUsed;
80 } 80 }
81 81
82 // Number of bytes allocated. 82 // Number of bytes allocated.
83 unsigned capacity() const 83 unsigned capacity() const
84 { 84 {
85 ASSERT(isValid());
85 return m_buffer->byteLength(); 86 return m_buffer->byteLength();
86 } 87 }
87 88
88 void shrinkToFit(); 89 void shrinkToFit();
89 90
90 const void* data() const 91 const void* data() const
91 { 92 {
93 ASSERT(isValid());
92 return m_buffer->data(); 94 return m_buffer->data();
93 } 95 }
94 96
95 // If set to false, the capacity won't be expanded and when appended data 97 // If set to false, the capacity won't be expanded and when appended data
96 // overflows, the overflowed part will be dropped. 98 // overflows, the overflowed part will be dropped.
97 void setVariableCapacity(bool value) 99 void setVariableCapacity(bool value)
98 { 100 {
99 m_variableCapacity = value; 101 m_variableCapacity = value;
100 } 102 }
101 103
102 private: 104 private:
103 // Expands the size of m_buffer to size + m_bytesUsed bytes. Returns true 105 // Expands the size of m_buffer to size + m_bytesUsed bytes. Returns true
104 // iff successful. If reallocation is needed, copies only data in 106 // iff successful. If reallocation is needed, copies only data in
105 // [0, m_bytesUsed) range. 107 // [0, m_bytesUsed) range.
106 bool expandCapacity(unsigned size); 108 bool expandCapacity(unsigned size);
107 109
108 unsigned m_bytesUsed; 110 unsigned m_bytesUsed;
109 bool m_variableCapacity; 111 bool m_variableCapacity;
110 RefPtr<ArrayBuffer> m_buffer; 112 RefPtr<ArrayBuffer> m_buffer;
111 }; 113 };
112 114
113 } // namespace WTF 115 } // namespace WTF
114 116
115 using WTF::ArrayBufferBuilder; 117 using WTF::ArrayBufferBuilder;
116 118
117 #endif // ArrayBufferBuilder_h 119 #endif // ArrayBufferBuilder_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/ArrayBuffer.cpp ('k') | third_party/WebKit/Source/wtf/ArrayBufferBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698