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

Side by Side Diff: third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp

Issue 2518253002: Move Partition Allocator into Chromium base. (Closed)
Patch Set: Move OOM_CRASH into its own, more specific header. Fixes Windows build. Created 4 years 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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "wtf/typed_arrays/ArrayBufferContents.h" 27 #include "wtf/typed_arrays/ArrayBufferContents.h"
28 28
29 #include "base/allocator/partition_allocator/partition_alloc.h"
29 #include "wtf/Assertions.h" 30 #include "wtf/Assertions.h"
30 #include "wtf/allocator/PartitionAlloc.h"
31 #include "wtf/allocator/Partitions.h" 31 #include "wtf/allocator/Partitions.h"
32 #include <string.h> 32 #include <string.h>
33 33
34 namespace WTF { 34 namespace WTF {
35 35
36 void ArrayBufferContents::defaultAdjustAmountOfExternalAllocatedMemoryFunction( 36 void ArrayBufferContents::defaultAdjustAmountOfExternalAllocatedMemoryFunction(
37 int64_t diff) { 37 int64_t diff) {
38 // Do nothing by default. 38 // Do nothing by default.
39 } 39 }
40 40
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 void ArrayBufferContents::allocateMemory(size_t size, 121 void ArrayBufferContents::allocateMemory(size_t size,
122 InitializationPolicy policy, 122 InitializationPolicy policy,
123 void*& data) { 123 void*& data) {
124 allocateMemoryWithFlags(size, policy, 0, data); 124 allocateMemoryWithFlags(size, policy, 0, data);
125 } 125 }
126 126
127 void ArrayBufferContents::allocateMemoryOrNull(size_t size, 127 void ArrayBufferContents::allocateMemoryOrNull(size_t size,
128 InitializationPolicy policy, 128 InitializationPolicy policy,
129 void*& data) { 129 void*& data) {
130 allocateMemoryWithFlags(size, policy, PartitionAllocReturnNull, data); 130 allocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull, data);
131 } 131 }
132 132
133 void ArrayBufferContents::freeMemory(void* data, size_t size) { 133 void ArrayBufferContents::freeMemory(void* data, size_t size) {
134 Partitions::bufferFree(data); 134 Partitions::bufferFree(data);
135 } 135 }
136 136
137 ArrayBufferContents::DataHolder::DataHolder() 137 ArrayBufferContents::DataHolder::DataHolder()
138 : m_data(nullptr), m_sizeInBytes(0), m_isShared(NotShared) {} 138 : m_data(nullptr), m_sizeInBytes(0), m_isShared(NotShared) {}
139 139
140 ArrayBufferContents::DataHolder::~DataHolder() { 140 ArrayBufferContents::DataHolder::~DataHolder() {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 if (!m_data) 185 if (!m_data)
186 return; 186 return;
187 187
188 m_sizeInBytes = source.sizeInBytes(); 188 m_sizeInBytes = source.sizeInBytes();
189 memcpy(m_data, source.data(), source.sizeInBytes()); 189 memcpy(m_data, source.data(), source.sizeInBytes());
190 190
191 adjustAmountOfExternalAllocatedMemory(m_sizeInBytes); 191 adjustAmountOfExternalAllocatedMemory(m_sizeInBytes);
192 } 192 }
193 193
194 } // namespace WTF 194 } // namespace WTF
OLDNEW
« base/allocator/oom.h ('K') | « third_party/WebKit/Source/wtf/text/StringImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698