Chromium Code Reviews| Index: base/allocator/partition_allocator/partition_allocator.h |
| diff --git a/third_party/WebKit/Source/wtf/allocator/PartitionAllocator.h b/base/allocator/partition_allocator/partition_allocator.h |
| similarity index 63% |
| rename from third_party/WebKit/Source/wtf/allocator/PartitionAllocator.h |
| rename to base/allocator/partition_allocator/partition_allocator.h |
| index 8a6659031ff19f77a899e8d92c1b7dcda0384ad4..ba934d9c9291bc591bd85a4fd41afbd3c63501b0 100644 |
| --- a/third_party/WebKit/Source/wtf/allocator/PartitionAllocator.h |
| +++ b/base/allocator/partition_allocator/partition_allocator.h |
| @@ -1,73 +1,45 @@ |
| -/* |
| - * Copyright (C) 2013 Google Inc. All rights reserved. |
| - * |
| - * Redistribution and use in source and binary forms, with or without |
| - * modification, are permitted provided that the following conditions are |
| - * met: |
| - * |
| - * * Redistributions of source code must retain the above copyright |
| - * notice, this list of conditions and the following disclaimer. |
| - * * Redistributions in binary form must reproduce the above |
| - * copyright notice, this list of conditions and the following disclaimer |
| - * in the documentation and/or other materials provided with the |
| - * distribution. |
| - * * Neither the name of Google Inc. nor the names of its |
| - * contributors may be used to endorse or promote products derived from |
| - * this software without specific prior written permission. |
| - * |
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| - */ |
| - |
| -#ifndef WTF_PartitionAllocator_h |
| -#define WTF_PartitionAllocator_h |
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| + |
| +#ifndef BASE_ALLOCATOR_PARTITION_ALLOCATOR_PARTITION_ALLOCATOR_H |
| +#define BASE_ALLOCATOR_PARTITION_ALLOCATOR_PARTITION_ALLOCATOR_H |
| // This is the allocator that is used for allocations that are not on the |
| // traced, garbage collected heap. It uses FastMalloc for collections, |
| // but uses the partition allocator for the backing store of the collections. |
| -#include "wtf/Allocator.h" |
| -#include "wtf/Assertions.h" |
| -#include "wtf/allocator/PartitionAlloc.h" |
| -#include "wtf/allocator/Partitions.h" |
| - |
| #include <string.h> |
| -namespace WTF { |
| +#include "base/allocator/partition_allocator/partition_alloc.h" |
| +#include "base/allocator/partition_allocator/partitions.h" |
| + |
| +namespace base { |
| class PartitionAllocatorDummyVisitor { |
| DISALLOW_NEW(); |
| }; |
| -class WTF_EXPORT PartitionAllocator { |
| +class BASE_EXPORT PartitionAllocator { |
| public: |
| typedef PartitionAllocatorDummyVisitor Visitor; |
| static const bool isGarbageCollected = false; |
| template <typename T> |
| static size_t quantizedSize(size_t count) { |
| - RELEASE_ASSERT(count <= kGenericMaxDirectMapped / sizeof(T)); |
| + CHECK(count <= kGenericMaxDirectMapped / sizeof(T)); |
| return partitionAllocActualSize(Partitions::bufferPartition(), |
| count * sizeof(T)); |
| } |
| template <typename T> |
| static T* allocateVectorBacking(size_t size) { |
| return reinterpret_cast<T*>( |
| - allocateBacking(size, WTF_HEAP_PROFILER_TYPE_NAME(T))); |
| + allocateBacking(size, PARTITION_HEAP_PROFILER_TYPE_NAME(T))); |
| } |
| template <typename T> |
| static T* allocateExpandedVectorBacking(size_t size) { |
| return reinterpret_cast<T*>( |
| - allocateBacking(size, WTF_HEAP_PROFILER_TYPE_NAME(T))); |
| + allocateBacking(size, PARTITION_HEAP_PROFILER_TYPE_NAME(T))); |
| } |
| static void freeVectorBacking(void* address); |
| static inline bool expandVectorBacking(void*, size_t) { return false; } |
| @@ -96,11 +68,11 @@ class WTF_EXPORT PartitionAllocator { |
| template <typename T, typename HashTable> |
| static T* allocateHashTableBacking(size_t size) { |
| return reinterpret_cast<T*>( |
| - allocateBacking(size, WTF_HEAP_PROFILER_TYPE_NAME(T))); |
| + allocateBacking(size, PARTITION_HEAP_PROFILER_TYPE_NAME(T))); |
| } |
| template <typename T, typename HashTable> |
| static T* allocateZeroedHashTableBacking(size_t size) { |
| - void* result = allocateBacking(size, WTF_HEAP_PROFILER_TYPE_NAME(T)); |
| + void* result = allocateBacking(size, PARTITION_HEAP_PROFILER_TYPE_NAME(T)); |
| memset(result, 0, size); |
| return reinterpret_cast<T*>(result); |
| } |
| @@ -115,7 +87,7 @@ class WTF_EXPORT PartitionAllocator { |
| static void free(void* address) { Partitions::fastFree(address); } |
| template <typename T> |
| static void* newArray(size_t bytes) { |
| - return malloc<void*, void>(bytes, WTF_HEAP_PROFILER_TYPE_NAME(T)); |
| + return malloc<void*, void>(bytes, PARTITION_HEAP_PROFILER_TYPE_NAME(T)); |
| } |
| static void deleteArray(void* ptr) { |
| free(ptr); // Not the system free, the one from this class. |
| @@ -134,18 +106,18 @@ class WTF_EXPORT PartitionAllocator { |
| // even in official builds (because |char| makes up a large portion of the |
| // heap.) |
| template <> |
| -WTF_EXPORT char* PartitionAllocator::allocateVectorBacking<char>(size_t); |
| +BASE_EXPORT char* PartitionAllocator::allocateVectorBacking<char>(size_t); |
| template <> |
| -WTF_EXPORT char* PartitionAllocator::allocateExpandedVectorBacking<char>( |
| +BASE_EXPORT char* PartitionAllocator::allocateExpandedVectorBacking<char>( |
| size_t); |
| -} // namespace WTF |
| +} // namespace base |
| -#define WTF_USE_ALLOCATOR(ClassName, Allocator) \ |
| +#define USE_ALLOCATOR(ClassName, Allocator) \ |
| public: \ |
| void* operator new(size_t size) { \ |
| return Allocator::template malloc<void*, ClassName>( \ |
| - size, WTF_HEAP_PROFILER_TYPE_NAME(ClassName)); \ |
| + size, PARTITION_HEAP_PROFILER_TYPE_NAME(ClassName)); \ |
| } \ |
| void operator delete(void* p) { Allocator::free(p); } \ |
| void* operator new[](size_t size) { \ |
| @@ -161,6 +133,6 @@ WTF_EXPORT char* PartitionAllocator::allocateExpandedVectorBacking<char>( |
| private: \ |
| typedef int __thisIsHereToForceASemicolonAfterThisMacro |
| -using WTF::PartitionAllocator; |
| +using base::PartitionAllocator; |
|
Primiano Tucci (use gerrit)
2016/11/22 14:28:33
same question: what is this for?
palmer
2016/11/24 01:05:56
Removed.
|
| -#endif // WTF_PartitionAllocator_h |
| +#endif // BASE_ALLOCATOR_PARTITION_ALLOCATOR_PARTITION_ALLOCATOR_H |